summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-07 04:18:09 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-07 04:18:09 -0400
commitb5f430fd59f7140722cc7940356c1de1ddd6f4d4 (patch)
tree44f8d8f62cd3535a897a28b5a99e8dfb917dc995 /app
parent26738698ae3a26c98d81a03309c150c7e38e3488 (diff)
parentc3af0f5b51dfe842ad9e4c5ea93e202e26e818ac (diff)
Merge branch 'clean2'
Conflicts: app/views/matches/index.html.erb app/views/matches/show.html.erb
Diffstat (limited to 'app')
-rw-r--r--app/controllers/matches_controller.rb2
-rw-r--r--app/views/matches/_form.html.erb4
-rw-r--r--app/views/matches/index.json.jbuilder2
-rw-r--r--app/views/matches/show.json.jbuilder2
4 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 9e376f7..3c93eac 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -260,7 +260,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)
+ params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations)
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 e2ec73b..c9c4aac 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -20,6 +20,10 @@
<%= f.label :remote_id %><br>
<%= f.text_field :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 18f172d..8efb8f9 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_id, :name, :winner_id, :remote_id
+ json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations
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 bfd2be4..37496c9 100644
--- a/app/views/matches/show.json.jbuilder
+++ b/app/views/matches/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :created_at, :updated_at
+json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at