summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-01 17:07:46 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-01 17:07:46 -0400
commit0f2b05889cba090e4824f62965ee8d131da09973 (patch)
tree88377b4f94cca6106170ef965b0cea00da3760f8 /app/controllers
parent433fc302fe2943e89a36657affea39d578475d20 (diff)
Re-ran generate.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/matches_controller.rb2
-rw-r--r--app/controllers/tournaments_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index d79a7fc..64414cf 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -69,6 +69,6 @@ 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)
+ params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id)
end
end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index d7db632..2565577 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -69,6 +69,6 @@ class TournamentsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def tournament_params
- params.require(:tournament).permit(: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(:name, :game_id, :status, :ger, :randomized_teams)
end
end