fix joining a tournament

4 files changed, 41 insertions, 25 deletions

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 8ed8cc9..6fc3ad6 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -1,6 +1,6 @@
 class TournamentsController < ApplicationController
   before_action :set_tournament, only: [:show, :edit, :update, :destroy, :join]
-  before_action :check_perms, only: [:new, :create, :edit, :update, :destroy]
+  before_action :check_perms, only: [:new, :create, :edit, :destroy]
 
   # GET /tournaments
   # GET /tournaments.json
@@ -42,13 +42,39 @@ class TournamentsController < ApplicationController
   # PATCH/PUT /tournaments/1
   # PATCH/PUT /tournaments/1.json
   def update
-    respond_to do |format|
-      if @tournament.update(tournament_params)
-        format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' }
-        format.json { head :no_content }
+    require 'pp'
+    pp params
+    if params[:update_action].nil?
+      check_perms
+      respond_to do |format|
+        if @tournament.update(tournament_params)
+          format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' }
+          format.json { head :no_content }
+        else
+          format.html { render action: 'edit' }
+          format.json { render json: @tournament.errors, status: :unprocessable_entity }
+        end
+      end
+    else
+      case params[:update_action]
+      when "join"
+        respond_to do |format|
+          if @tournament.join(current_user)
+            format.html { render action: 'show', notice: 'You have joined this tournament.' }
+            format.json { head :no_content }
+          end
+          format.html { render action: 'permission_denied', status: :forbidden }
+          format.json { render json: "Permission denied", status: :forbidden }
+        end
+      #when "open"
+        # TODO
+      #when "close"
+        # TODO
       else
-        format.html { render action: 'edit' }
-        format.json { render json: @tournament.errors, status: :unprocessable_entity }
+        respond_to do |format|
+          format.html { render action: 'show', notice: "Invalid action", status: :unprocessable_entity }
+          format.json { render json: @tournament.errors, status: :unprocessable_entity }
+        end
       end
     end
   end
@@ -63,19 +89,6 @@ class TournamentsController < ApplicationController
     end
   end
 
-  # POST /tournaments/1/join
-  # POST /tournaments/1/join.json
-  def join
-    respond_to do |format|
-      if @tournament.join(current_user)
-        format.html { redirect_to @tournament, notice: 'You have joined this tournament.' }
-        format.json { head :no_content }
-      end
-      format.html { render action: 'permission_denied', status: :forbidden }
-      format.json { render json: "Permission denied", status: :forbidden }
-    end
-  end
-
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_tournament
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index ca7fade..26dec72 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -1,7 +1,8 @@
 class Tournament < ActiveRecord::Base
 	belongs_to :game
 	has_many :matches
-	has_many :users, :through => :user_tournament_pair
+	has_many :user_tournament_pairs
+	has_many :users, :through => :user_tournament_pairs
 
 	def open?
 		return true
@@ -12,10 +13,10 @@ class Tournament < ActiveRecord::Base
 	end
 
 	def join(user)
-		unless joinable?(user)
+		unless joinable_by?(user)
 			return false
 		end
-		pair = new_user_tournament_pair(user: user)
+		pair = UserTournamentPair.new(tournament: self, user: user)
 		return pair.save
 	end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6405c8e..bad7f7b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
-	has_many :tournaments, :through => :user_tournament_pair
+	has_many :user_tournament_pairs
+	has_many :tournaments, :through => :user_tournament_pairs
 
 	before_save { self.email = email.downcase }
 	before_save { self.user_name = user_name }
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 85ed026..91c1961 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,5 +1,6 @@
 <% if @tournament.joinable_by?(current_user) %>
-	<%= form_tag(tournament_page(@tournament)+"/join", method: "get") do %>
+	<%= form_tag(tournament_path(@tournament), method: "put") do %>
+		<input type="hidden" name="update_action" value="join">
 		<%= submit_tag("Join") %>
 	<% end %>
 <% end %>