From a2de6b22a720671b796c88c694db905665fda142 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 1 Apr 2014 18:01:53 -0400
Subject: oops, removed ger

---
 app/controllers/tournaments_controller.rb | 2 +-
 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 +-
 6 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'app')

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 2565577..c4c41ab 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -69,6 +69,6 @@ class TournamentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def tournament_params
-      params.require(:tournament).permit(:name, :game_id, :status, :ger, :randomized_teams)
+      params.require(:tournament).permit(:name, :game_id, :status, :randomized_teams)
     end
 end
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
@@ -23,10 +23,6 @@
     <%= f.label :status %><br>
     <%= 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 %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 96bb5ba..4c1d0ff 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -6,7 +6,6 @@
       <th>Name</th>
       <th>Game</th>
       <th>Status</th>
-      <th>Ger</th>
       <th>Randomized teams</th>
       <th></th>
       <th></th>
@@ -20,7 +19,6 @@
         <td><%= tournament.name %></td>
         <td><%= tournament.game %></td>
         <td><%= tournament.status %></td>
-        <td><%= tournament.ger %></td>
         <td><%= tournament.randomized_teams %></td>
         <td><%= link_to 'Show', tournament %></td>
         <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
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.html.erb b/app/views/tournaments/show.html.erb
index 3657871..d58452b 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -15,11 +15,6 @@
   <%= @tournament.status %>
 </p>
 
-<p>
-  <strong>Ger:</strong>
-  <%= @tournament.ger %>
-</p>
-
 <p>
   <strong>Randomized teams:</strong>
   <%= @tournament.randomized_teams %>
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
-- 
cgit v1.2.3