diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
commit | 0c1299795a492e6296eb8e15bca576ea5139be6b (patch) | |
tree | 3921daf8c26d656b12b20ee22be63c97fa20f6fa /app/views/teams | |
parent | 110d67f433c091a3b739c5bbebe110d963efaa73 (diff) | |
parent | fe7d5ad458b4cabd8fd57b47f81abc56dd8532ad (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/controllers/sessions_controller.rb
app/views/sessions/new.html.erb
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 |