diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/matches/_form.html.erb | 6 | ||||
| -rw-r--r-- | app/views/matches/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/matches/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/matches/show.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/teams/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/teams/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/teams/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/teams/show.html.erb | 5 | ||||
| -rw-r--r-- | app/views/teams/show.json.jbuilder | 2 |
9 files changed, 6 insertions, 21 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 88fe733..9d402b3 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -9,16 +9,12 @@ <%= f.text_field :tournament_stage_id %> </div> <div class="field"> - <%= 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 %> + <%= f.text_area :remote_id %> </div> <div class="field"> <%= f.label :submitted_peer_evaluations %><br> diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index cebabb3..abca42b 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -13,7 +13,7 @@ <tbody class="table-hover"> <% @tournament.matches.order(:id).reverse.each do |match| %><tr> - <td><%= match.name %></td> + <td><%= "Match #{match.id}" %></td> <td><%= match.status %></td> <td><%= (match.winner.nil? ? "-" : "Team #{match.winner.id}") %></td> <td><%= link_to "Show", tournament_match_path(@tournament, match) %> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index f2499ac..bef149d 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, :name, :winner_id, :remote_id, :submitted_peer_evaluations + json.extract! match, :id, :status, :tournament_stage_id, :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 5b543ea..145f069 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, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at diff --git a/app/views/teams/_form.html.erb b/app/views/teams/_form.html.erb index cdd4299..fd10129 100644 --- a/app/views/teams/_form.html.erb +++ b/app/views/teams/_form.html.erb @@ -11,10 +11,6 @@ </div> <% end %> - <div class="field"> - <%= f.label :match_id %><br> - <%= f.text_field :match_id %> - </div> <div class="actions"> <%= f.submit %> </div> diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb index 6a3188d..b077e10 100644 --- a/app/views/teams/index.html.erb +++ b/app/views/teams/index.html.erb @@ -3,7 +3,6 @@ <table> <thead> <tr> - <th>Match</th> <th></th> <th></th> <th></th> @@ -13,7 +12,6 @@ <tbody> <% @teams.each do |team| %> <tr> - <td><%= team.match %></td> <td><%= link_to 'Show', team %></td> <td><%= link_to 'Edit', edit_team_path(team) %></td> <td><%= link_to 'Destroy', team, method: :delete, data: { confirm: 'Are you sure?' } %></td> diff --git a/app/views/teams/index.json.jbuilder b/app/views/teams/index.json.jbuilder index ca0ec8b..b29428b 100644 --- a/app/views/teams/index.json.jbuilder +++ b/app/views/teams/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@teams) do |team| - json.extract! team, :id, :match_id + json.extract! team, :id json.url team_url(team, format: :json) end diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb index e41692a..5b18d33 100644 --- a/app/views/teams/show.html.erb +++ b/app/views/teams/show.html.erb @@ -1,9 +1,4 @@ <p id="notice"><%= notice %></p> -<p> - <strong>Match:</strong> - <%= @team.match %> -</p> - <%= link_to 'Edit', edit_team_path(@team) %> | <%= link_to 'Back', teams_path %> diff --git a/app/views/teams/show.json.jbuilder b/app/views/teams/show.json.jbuilder index 8a85dcc..1538019 100644 --- a/app/views/teams/show.json.jbuilder +++ b/app/views/teams/show.json.jbuilder @@ -1 +1 @@ -json.extract! @team, :id, :match_id, :created_at, :updated_at +json.extract! @team, :id, :created_at, :updated_at |