oops, removed ger

29 files changed, 7 insertions, 22 deletions

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
@@ -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.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
@@ -16,11 +16,6 @@
 </p>
 
 <p>
-  <strong>Ger:</strong>
-  <%= @tournament.ger %>
-</p>
-
-<p>
   <strong>Randomized teams:</strong>
   <%= @tournament.randomized_teams %>
 </p>
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
diff --git a/db/migrate/20140401205355_create_servers.rb b/db/migrate/20140401215718_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140401205355_create_servers.rb
+++ b/db/migrate/20140401215718_create_servers.rb
diff --git a/db/migrate/20140401205357_create_matches.rb b/db/migrate/20140401215720_create_matches.rb
index 31eea12..31eea12 100644
--- a/db/migrate/20140401205357_create_matches.rb
+++ b/db/migrate/20140401215720_create_matches.rb
diff --git a/db/migrate/20140401205400_create_teams.rb b/db/migrate/20140401215723_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140401205400_create_teams.rb
+++ b/db/migrate/20140401215723_create_teams.rb
diff --git a/db/migrate/20140401205402_create_alerts.rb b/db/migrate/20140401215725_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140401205402_create_alerts.rb
+++ b/db/migrate/20140401215725_create_alerts.rb
diff --git a/db/migrate/20140401205405_create_pms.rb b/db/migrate/20140401215728_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140401205405_create_pms.rb
+++ b/db/migrate/20140401215728_create_pms.rb
diff --git a/db/migrate/20140401205407_create_tournaments.rb b/db/migrate/20140401215730_create_tournaments.rb
index 3e36441..55f76a3 100644
--- a/db/migrate/20140401205407_create_tournaments.rb
+++ b/db/migrate/20140401215730_create_tournaments.rb
@@ -4,7 +4,6 @@ class CreateTournaments < ActiveRecord::Migration
       t.string :name
       t.references :game, index: true
       t.integer :status
-      t.string :ger
       t.boolean :randomized_teams
 
       t.timestamps
diff --git a/db/migrate/20140401205410_create_games.rb b/db/migrate/20140401215733_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140401205410_create_games.rb
+++ b/db/migrate/20140401215733_create_games.rb
diff --git a/db/migrate/20140401205412_create_users.rb b/db/migrate/20140401215735_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140401205412_create_users.rb
+++ b/db/migrate/20140401215735_create_users.rb
diff --git a/db/migrate/20140401205415_create_sessions.rb b/db/migrate/20140401215738_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140401205415_create_sessions.rb
+++ b/db/migrate/20140401215738_create_sessions.rb
diff --git a/db/migrate/20140401205417_create_server_settings.rb b/db/migrate/20140401215740_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140401205417_create_server_settings.rb
+++ b/db/migrate/20140401215740_create_server_settings.rb
diff --git a/db/migrate/20140401205420_create_game_settings.rb b/db/migrate/20140401215743_create_game_settings.rb
index 0ebbf18..0ebbf18 100644
--- a/db/migrate/20140401205420_create_game_settings.rb
+++ b/db/migrate/20140401215743_create_game_settings.rb
diff --git a/db/migrate/20140401205422_create_tournament_preferences.rb b/db/migrate/20140401215745_create_tournament_preferences.rb
index 991d659..991d659 100644
--- a/db/migrate/20140401205422_create_tournament_preferences.rb
+++ b/db/migrate/20140401215745_create_tournament_preferences.rb
diff --git a/db/migrate/20140401205424_create_scores.rb b/db/migrate/20140401215747_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140401205424_create_scores.rb
+++ b/db/migrate/20140401215747_create_scores.rb
diff --git a/db/migrate/20140401205427_create_remote_usernames.rb b/db/migrate/20140401215750_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140401205427_create_remote_usernames.rb
+++ b/db/migrate/20140401215750_create_remote_usernames.rb
diff --git a/db/migrate/20140401205429_create_tournament_players_join_table.rb b/db/migrate/20140401215752_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140401205429_create_tournament_players_join_table.rb
+++ b/db/migrate/20140401215752_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140401205432_create_tournament_hosts_join_table.rb b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140401205432_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140401205434_create_team_user_join_table.rb b/db/migrate/20140401215757_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140401205434_create_team_user_join_table.rb
+++ b/db/migrate/20140401215757_create_team_user_join_table.rb
diff --git a/db/migrate/20140401205437_create_match_team_join_table.rb b/db/migrate/20140401215800_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140401205437_create_match_team_join_table.rb
+++ b/db/migrate/20140401215800_create_match_team_join_table.rb
diff --git a/db/migrate/20140401205446_add_hidden_attrs_to_user.rb b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140401205446_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index eda2839..c3be661 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140401205446) do
+ActiveRecord::Schema.define(version: 20140401215809) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -155,7 +155,6 @@ ActiveRecord::Schema.define(version: 20140401205446) do
     t.string   "name"
     t.integer  "game_id"
     t.integer  "status"
-    t.string   "ger"
     t.boolean  "randomized_teams"
     t.datetime "created_at"
     t.datetime "updated_at"
diff --git a/generate.sh b/generate.sh
index 261392f..9db2b07 100755
--- a/generate.sh
+++ b/generate.sh
@@ -22,7 +22,7 @@ bundle exec rails generate scaffold match status:integer tournament:references n
 bundle exec rails generate scaffold team match:references $NOTEST
 bundle exec rails generate scaffold alert author:references message:text $NOTEST
 bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST
-bundle exec rails generate scaffold tournament name:string:unique game:references status:integer ger randomized_teams:boolean
+bundle exec rails generate scaffold tournament name:string:unique game:references status:integer randomized_teams:boolean
 bundle exec rails generate scaffold game \
 	name:text \
 	min_players_per_team:integer max_players_per_team:integer \
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index 775288c..0c1ff60 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase
 
   test "should create tournament" do
     assert_difference('Tournament.count') do
-      post :create, tournament: { game_id: @tournament.game_id, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
+      post :create, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
     end
 
     assert_redirected_to tournament_path(assigns(:tournament))
@@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase
   end
 
   test "should update tournament" do
-    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
+    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
     assert_redirected_to tournament_path(assigns(:tournament))
   end
 
diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml
index 25bb065..d5a4366 100644
--- a/test/fixtures/tournaments.yml
+++ b/test/fixtures/tournaments.yml
@@ -4,12 +4,10 @@ one:
   name: MyString
   game_id: 
   status: 1
-  ger: MyString
   randomized_teams: false
 
 two:
   name: MyString
   game_id: 
   status: 1
-  ger: MyString
   randomized_teams: false