diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
| commit | db45b2441bd57a5e640b529ef6239c98a3030fe2 (patch) | |
| tree | bcffce81e433821f6ddd9a6588b40ee1d5f84592 /app/controllers | |
| parent | 4aeaf0e41518695c3c6ba3b09025516f67b06a11 (diff) | |
| parent | 474a048ae4a4fae86e7fde93745f0ea79c7ed717 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/games_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/matches_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index f18a5ad..1f0bdd8 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -67,6 +67,6 @@ class GamesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def game_params - params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) + params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) end end diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 95f99a6..d7a8b99 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -250,7 +250,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_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations) + params.require(:match).permit(:status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations) end # Turn of check_edit, since our #update is flexible diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 57e73aa..b6f911f 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -136,7 +136,7 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:game, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) + params.require(:tournament).permit(:game, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) end def is_owner?(object) |