summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-01 18:04:55 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-01 18:04:55 -0400
commite6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (patch)
treed6358feeaf8399f97a363ccccc4d2de24bc48db9 /app
parentac77cea14d5708f47df42774b0b281391b2e3c89 (diff)
parenta2de6b22a720671b796c88c694db905665fda142 (diff)
Removed ger
Diffstat (limited to 'app')
-rw-r--r--app/views/tournaments/_form.html.erb4
-rw-r--r--app/views/tournaments/index.json.jbuilder2
-rw-r--r--app/views/tournaments/show.json.jbuilder2
3 files changed, 2 insertions, 6 deletions
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index fe92318..3dadbf7 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -24,10 +24,6 @@
<%= f.number_field :status %>
</div>
<div class="field">
- <%= f.label :ger %><br>
- <%= f.text_field :ger %>
- </div>
- <div class="field">
<%= f.label :randomized_teams %><br>
<%= f.check_box :randomized_teams %>
</div>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 653442f..32587df 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, :name, :game_id, :status, :ger, :randomized_teams
+ json.extract! tournament, :id, :name, :game_id, :status, :randomized_teams
json.url tournament_url(tournament, format: :json)
end
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index d70a27a..d543c76 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :name, :game_id, :status, :ger, :randomized_teams, :created_at, :updated_at
+json.extract! @tournament, :id, :name, :game_id, :status, :randomized_teams, :created_at, :updated_at