Merge branch 'clean'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/teams/show.html.erb
	app/views/tournaments/index.html.erb
	config/routes.rb

1 files changed, 14 insertions, 6 deletions

diff --git a/generate.sh b/generate.sh
index aca13bb..db9e84b 100755
--- a/generate.sh
+++ b/generate.sh
@@ -18,20 +18,28 @@ git checkout clean-start -- app test config/routes.rb
 
 # The whole shebang, models, views, and controllers
 bundle exec rails generate scaffold server --force $NOTEST
-bundle exec rails generate scaffold tournament game:references $NOTEST
 bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST
-bundle exec rails generate scaffold team $NOTEST
+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 game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST
+bundle exec rails generate scaffold tournament game:references status:integer \
+	min_players_per_team:integer max_players_per_team:integer \
+	min_teams_per_match:integer max_teams_per_match:integer \
+	set_rounds:integer randomized_teams:boolean
+bundle exec rails generate scaffold game \
+	name:text \
+	min_players_per_team:integer max_players_per_team:integer \
+	min_teams_per_match:integer max_teams_per_match:integer \
+	set_rounds:integer randomized_teams:boolean
 bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq
 bundle exec rails generate scaffold session user:references
 
 # Just models
-bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST
 bundle exec rails generate model server_settings $NOTEST
-bundle exec rails generate model tournament_option $NOTEST
-
+bundle exec rails generate model tournament_option tournament:references vartype:integer name:string value:text $NOTEST
+bundle exec rails generate model game_option vartype:integer name:string default:text $NOTEST
+bundle exec rails generate model score user:references match:references value:integer $NOTEST
+# Bridge Models
 bundle exec rails generate model user_team_pair user:references team:references $NOTEST
 bundle exec rails generate model user_tournament_pair user:references tournament:references
 bundle exec rails generate model team_match_pair team:references match:references $NOTEST