diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
| commit | 4f523f424cb41733c19754c5d4b538053d86ab74 (patch) | |
| tree | 55736af3a1ffe6494eb978be17f348b7e899630f /app/views | |
| parent | a3a72a54cc5742ffe82611fb87b3445c251d0676 (diff) | |
| parent | 4c5c8b978d6bc70811e95e6da5afd06ec7a2e27e (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/matches_controller.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/matches/_form.html.erb | 8 | ||||
| -rw-r--r-- | app/views/matches/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/matches/show.json.jbuilder | 2 |
3 files changed, 2 insertions, 10 deletions
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 |