diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-01 18:46:22 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-01 18:46:22 -0400 |
| commit | 2b79a033262dfe610eb22b7f6b3614db9cb134b1 (patch) | |
| tree | 2bb77aa81022e7c01cccfb67127c7acd2fbb65aa /app | |
| parent | f08191c3966851b19edc949d7819cc58190037d7 (diff) | |
| parent | e6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/tournaments/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/tournaments/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
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 |