diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
commit | 45c5d311492ef98ed702beaf043d289a705a5e0b (patch) | |
tree | c0bea2e65d21127a1fd34a245b5bb7fc47123bb0 /app/controllers | |
parent | 9d226fcd27b6c2470edf718ad36a262348891470 (diff) | |
parent | c927cd7c043d982f8ffb51c8a78288d88d825d82 (diff) |
Merge branch 'clean2'
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/matches_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/teams_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index e95f24a..59f376a 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -244,7 +244,7 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations) + params.require(:match).permit(:status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations) end # Turn of check_edit, since our #update is flexible diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb index 57ae256..6abc74c 100644 --- a/app/controllers/teams_controller.rb +++ b/app/controllers/teams_controller.rb @@ -68,7 +68,7 @@ class TeamsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def team_params - params.require(:team).permit(:match_id) + params[:team] end def is_owner?(object) |