Merge branch 'master' of https://github.com/LukeShu/leaguer

2 files changed, 4 insertions, 0 deletions

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index a2a1269..4a20df2 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -230,11 +230,14 @@ class MatchesController < ApplicationController
 				base_score = next_score
 				next_score += base_score  
 			end
+
 			@match.submitted_peer_evaluations += 1
 			players = []; @match.teams.each{|t| players.concat(t.users.all)}
 			if (@match.submitted_peer_evaluations == players.count) 
 				@match.status = 3
 			end
+
+
 			respond_to do |format|
 				if @match.save
 					format.html { redirect_to tournament_match_path(@tournament, @match), notice: 'Scores Submitted' }
diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
index c83d2ae..3368663 100644
--- a/app/controllers/pms_controller.rb
+++ b/app/controllers/pms_controller.rb
@@ -57,6 +57,7 @@ class PmsController < ApplicationController
 				format.json { render json: @pm.errors, status: :unprocessable_entity }
 			end
 		end
+		current_user.reply_to_conversation(@pm.conversation, @pm.message)
 	end
 
 	# DELETE /pms/1