From 4e754e04d6bd04267e5a55011aa9f4f2a2fc7859 Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Tue, 25 Mar 2014 16:30:13 -0400
Subject: Tournament has a NAME now
---
app/views/tournaments/_form.html.erb | 4 ++++
app/views/tournaments/index.html.erb | 2 ++
app/views/tournaments/index.json.jbuilder | 2 +-
app/views/tournaments/show.html.erb | 5 +++++
app/views/tournaments/show.json.jbuilder | 2 +-
5 files changed, 13 insertions(+), 2 deletions(-)
(limited to 'app/views/tournaments')
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index d098cbb..38855a0 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -11,6 +11,10 @@
</div>
<% end %>
+ <div class="field">
+ <%= f.label :name %><br>
+ <%= f.text_field :name %>
+ </div>
<div class="field">
<%= f.label :game_id %><br>
<%= f.text_field :game_id %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index fb8b381..f8f21e7 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -3,6 +3,7 @@
<table>
<thead>
<tr>
+ <th>Name</th>
<th>Game</th>
<th>Status</th>
<th>Min players per team</th>
@@ -20,6 +21,7 @@
<tbody>
<% @tournaments.each do |tournament| %>
<tr>
+ <td><%= tournament.name %></td>
<td><%= tournament.game %></td>
<td><%= tournament.status %></td>
<td><%= tournament.min_players_per_team %></td>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index e95c6a7..4038f04 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
json.array!(@tournaments) do |tournament|
- json.extract! tournament, :id, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
+ json.extract! tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
json.url tournament_url(tournament, format: :json)
end
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 208c6f4..3cb6179 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,5 +1,10 @@
<p id="notice"><%= notice %></p>
+<p>
+ <strong>Name:</strong>
+ <%= @tournament.name %>
+</p>
+
<p>
<strong>Game:</strong>
<%= @tournament.game %>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index de2fbe0..27fd5c0 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at
+json.extract! @tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at
--
cgit v1.2.3-2-g168b