diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
commit | 706392b7c4520382ddd8f827b31205c6b71f5320 (patch) | |
tree | 55444920bb49c5cc104e919737ebcda44eb45321 /app/views/teams | |
parent | eebd00ba4692a6a285c9807705331ab924ce225f (diff) | |
parent | d72452a5965c0df32a13053ae86bcd529fc0fc9e (diff) |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/teams/show.html.erb
app/views/tournaments/index.html.erb
config/routes.rb
Diffstat (limited to 'app/views/teams')
-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 | 7 | ||||
-rw-r--r-- | app/views/teams/show.json.jbuilder | 2 |
5 files changed, 15 insertions, 2 deletions
diff --git a/app/views/teams/_form.html.erb b/app/views/teams/_form.html.erb index fd10129..cdd4299 100644 --- a/app/views/teams/_form.html.erb +++ b/app/views/teams/_form.html.erb @@ -11,6 +11,10 @@ </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 b077e10..6a3188d 100644 --- a/app/views/teams/index.html.erb +++ b/app/views/teams/index.html.erb @@ -3,6 +3,7 @@ <table> <thead> <tr> + <th>Match</th> <th></th> <th></th> <th></th> @@ -12,6 +13,7 @@ <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 b29428b..ca0ec8b 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 + json.extract! team, :id, :match_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 ab49d65..e41692a 100644 --- a/app/views/teams/show.html.erb +++ b/app/views/teams/show.html.erb @@ -1,2 +1,9 @@ +<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 1538019..8a85dcc 100644 --- a/app/views/teams/show.json.jbuilder +++ b/app/views/teams/show.json.jbuilder @@ -1 +1 @@ -json.extract! @team, :id, :created_at, :updated_at +json.extract! @team, :id, :match_id, :created_at, :updated_at |