Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/views/tournaments/show.html.erb

1 files changed, 3 insertions, 3 deletions

diff --git a/generate.sh b/generate.sh
index 45a8ab6..2013703 100755
--- a/generate.sh
+++ b/generate.sh
@@ -18,11 +18,11 @@ 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 match tournament:references name:string winner:references --force $NOTEST
+bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references --force $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 tournament game:references status:integer \
+bundle exec rails generate scaffold tournament name:string:unique 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
@@ -37,7 +37,7 @@ bundle exec rails generate scaffold session user:references
 # Just models
 bundle exec rails generate model server_settings $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 game_setting game:references type:integer name:string default:text discription:text type_opt:text display_order:integer $NOTEST
 bundle exec rails generate model score user:references match:references value:integer $NOTEST
 
 # Join tables