diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /app/views/matches | |
parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) |
Settled Merge Conflicts.
Diffstat (limited to 'app/views/matches')
-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 | 1 | ||||
-rw-r--r-- | app/views/matches/show.json.jbuilder | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 3efb566..e2ec73b 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -12,6 +12,14 @@ <%= f.label :name %><br> <%= f.text_field :name %> </div> + <div class="field"> + <%= f.label :winner_id %><br> + <%= f.text_field :winner_id %> + </div> + <div class="field"> + <%= f.label :remote_id %><br> + <%= f.text_field :remote_id %> + </div> <div class="actions"> <%= f.submit %> </div> diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index d862d57..d463e50 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -7,6 +7,7 @@ <th>Tournament</th> <th>Name</th> <th>Winner</th> + <th>Remote</th> <th></th> <th></th> <th></th> @@ -21,9 +22,6 @@ <td><%= match.tournament %></td> <td><%= match.name %></td> <td><%= match.winner %></td> - <td><%= link_to 'Show', tournament_match_path(@tournament, match) %></td> - <td><%= link_to 'Edit', edit_tournament_match_path(@tournament, match) %></td> - <td><%= link_to 'Destroy', tournament_match_path(@tournament, match), method: :delete, data: { confirm: 'Are you sure?' } %></td> </tr> <% end %> </tbody> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index 1a63f5f..18f172d 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 + json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_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 6b962ad..53c3b38 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -32,4 +32,3 @@ </p> <% end %> -<%= link_to 'Back', tournament_matches_path %> diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index a3ef588..bfd2be4 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, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :created_at, :updated_at |