diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:47:29 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:47:29 -0400 |
commit | 4c5c8b978d6bc70811e95e6da5afd06ec7a2e27e (patch) | |
tree | e5e282392b0014d4cd6954c86c69b5d86e026d29 /app | |
parent | c09905a346d4a14feddcd1fccefa0e5dd98f51e3 (diff) |
ran ./generate.sh
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/matches_controller.rb | 2 | ||||
-rw-r--r-- | app/views/matches/_form.html.erb | 8 | ||||
-rw-r--r-- | app/views/matches/index.html.erb | 4 | ||||
-rw-r--r-- | app/views/matches/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/matches/show.html.erb | 10 | ||||
-rw-r--r-- | app/views/matches/show.json.jbuilder | 2 |
6 files changed, 3 insertions, 25 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index b1162ef..4042d3c 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_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations) + params.require(:match).permit(:status, :tournament_stage_id, :winner_id) end end diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 9e09fd8..768b655 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -23,14 +23,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.html.erb b/app/views/matches/index.html.erb index 766c3e8..85c94f2 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -6,8 +6,6 @@ <th>Status</th> <th>Tournament stage</th> <th>Winner</th> - <th>Remote</th> - <th>Submitted peer evaluations</th> <th></th> <th></th> <th></th> @@ -20,8 +18,6 @@ <td><%= match.status %></td> <td><%= match.tournament_stage %></td> <td><%= match.winner %></td> - <td><%= match.remote_id %></td> - <td><%= match.submitted_peer_evaluations %></td> <td><%= link_to 'Show', match %></td> <td><%= link_to 'Edit', edit_match_path(match) %></td> <td><%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %></td> 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.html.erb b/app/views/matches/show.html.erb index 8384ff2..b47a045 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -15,15 +15,5 @@ <%= @match.winner %> </p> -<p> - <strong>Remote:</strong> - <%= @match.remote_id %> -</p> - -<p> - <strong>Submitted peer evaluations:</strong> - <%= @match.submitted_peer_evaluations %> -</p> - <%= link_to 'Edit', edit_match_path(@match) %> | <%= link_to 'Back', matches_path %> 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 |