summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/matches_controller.rb3
-rw-r--r--app/views/matches/_form.html.erb8
-rw-r--r--app/views/matches/index.json.jbuilder2
-rw-r--r--app/views/matches/show.json.jbuilder2
4 files changed, 4 insertions, 11 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index d2dc918..e944983 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -88,7 +88,8 @@ 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, :winner_id, :remote_id, :submitted_peer_evaluations, :update_action)
+ params.require(:match).permit(:status, :tournament_stage_id, :winner_id)
+ params.require(:match).permit(:status, :tournament_stage_id, :winner_id)
end
# Turn of check_edit, since our #update is flexible
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index 9d402b3..a045e98 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -12,14 +12,6 @@
<%= f.label :winner_id %><br>
<%= f.text_field :winner_id %>
</div>
- <div class="field">
- <%= f.label :remote_id %><br>
- <%= f.text_area :remote_id %>
- </div>
- <div class="field">
- <%= f.label :submitted_peer_evaluations %><br>
- <%= f.number_field :submitted_peer_evaluations %>
- </div>
<div class="actions">
<%= f.submit %>
</div>
diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder
index bef149d..d5a97fe 100644
--- a/app/views/matches/index.json.jbuilder
+++ b/app/views/matches/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@matches) do |match|
- json.extract! match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations
+ json.extract! match, :id, :status, :tournament_stage_id, :winner_id
json.url match_url(match, format: :json)
end
diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder
index 145f069..dd2cde3 100644
--- a/app/views/matches/show.json.jbuilder
+++ b/app/views/matches/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at
+json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :created_at, :updated_at