From 60404adf63b762142d681084657ad947f9b9b06e Mon Sep 17 00:00:00 2001
From: Room5-Joey <room5-joey@room5joey-TZ77XE4.(none)>
Date: Tue, 13 May 2014 16:54:51 -0700
Subject: [PATCH] Can now join teams from the teams pages individually. If you
 already have a request active, it will remove that request and replace it
 with a new one (with a confirmation). I left the Agenda way of
 joining/cancelling join of teams.

---
 app/controllers/teamers_controller.rb | 10 ++++++++++
 app/controllers/teams_controller.rb   |  8 ++++++++
 app/controllers/users_controller.rb   |  2 +-
 app/views/teams/show.html.erb         | 14 ++++++++++++++
 app/views/users/agenda.html.erb       |  2 +-
 config/routes.rb                      |  2 +-
 6 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/controllers/teamers_controller.rb b/app/controllers/teamers_controller.rb
index 788b4d5..9227836 100644
--- a/app/controllers/teamers_controller.rb
+++ b/app/controllers/teamers_controller.rb
@@ -13,6 +13,16 @@ class TeamersController < ApplicationController
     redirect_to_back
   end
 
+  def edit
+    logger.info params
+    logger.info "hello world"
+    teamer_id = params["teamer"]
+    @teamer = Teamer.find(teamer_id)
+    @teamer.team_id = params["id"]
+    @teamer.save
+    redirect_to_back
+  end
+
   def destroy
     @teamer = Teamer.find params[:id]
     raise AccessError unless @teamer.can_destroy? cuser
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index 34c35cb..38453c2 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -6,6 +6,8 @@ class TeamsController < ApplicationController
   end
 
   def show
+    @teamer = Teamer.new
+    @teamer.user = @user
   end
 
   def new
@@ -13,6 +15,12 @@ class TeamsController < ApplicationController
     raise AccessError unless @team.can_create? cuser
   end
 
+  def replace_teamer
+    logger.info params
+    logger.info "hello" 
+    redirect_to_back
+  end
+
   def edit
     raise AccessError unless @team.can_update? cuser
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 38a4b65..257aaae 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -53,7 +53,7 @@ class UsersController < ApplicationController
     if @user.valid? and @user.save
       @user.profile = Profile.new
       @user.profile.user = @user
-      @user.profile.save
+      @user.profile.save!
       redirect_to action: :show, id: @user.id
       save_session @user
     else
diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb
index 357f2d0..59677ca 100644
--- a/app/views/teams/show.html.erb
+++ b/app/views/teams/show.html.erb
@@ -9,6 +9,20 @@
     </div>
   <% end %>
 
+  <% if cuser.teamers.joining.count == 0  && @team.active %>
+    <%= form_for @teamer do |f| %>
+      <%= f.error_messages %>
+      <%= f.hidden_field :user_id, :value => cuser.id %>
+      <%= f.hidden_field :team_id, :value => @team.id %>
+
+      <div class="controls inline">
+         <%= f.submit "Request To Join", class: 'button' %>
+      </div>
+    <% end %>
+  <% elsif cuser.teamers.joining.first.team != @team %>
+    <%= link_to 'Request To Join', edit_teamer_path("teamer" => cuser.teamers.joining.first), method: :get,confirm: "You have already requested to join #{cuser.teamers.joining.first.team}. Do you want to request to join #{@team} instead?", class: 'button' %>
+  <% end %>
+
   <div id="team" class="tabbed">
     <ul id="team-nav" class="tabs">
       <li><a href="#general">General</a></li>
diff --git a/app/views/users/agenda.html.erb b/app/views/users/agenda.html.erb
index 9271e63..a534348 100644
--- a/app/views/users/agenda.html.erb
+++ b/app/views/users/agenda.html.erb
@@ -57,7 +57,7 @@
         <% end %>
       <% else %>
         <div class="flash warning">
-          <p>You can join only be a member of one team at a time.</p>
+          <p>You can only request to join one team at a time.</p>
           <p>Currently you are trying to join <%= namelink @user.teamers.joining.first.team %></p>
           <p>You can cancel this request by clicking "Cancel Request"</p>
         </div>
diff --git a/config/routes.rb b/config/routes.rb
index 8898bce..2f2d9ca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -127,7 +127,7 @@ Ensl::Application.routes.draw do
 	match ':controller/:action/:id'
 	match ':controller/:action/:id.:format'
 	match ':controller/:action/:id/:id2'
-
+    match 'teamers/replace' => 'teamers#replace', :as => 'teamers_replace'
   namespace :api do
     namespace :v1 do
       resources :users