diff options
-rw-r--r-- | app/models/team.rb | 1 | ||||
-rw-r--r-- | app/models/tournament.rb | 8 | ||||
-rw-r--r-- | config/routes.rb | 2 | ||||
-rwxr-xr-x | generate.sh | 7 |
4 files changed, 4 insertions, 14 deletions
diff --git a/app/models/team.rb b/app/models/team.rb index 7aae7c2..77136e7 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -1,5 +1,4 @@ class Team < ActiveRecord::Base - belongs_to :match has_and_belongs_to_many :matches has_and_belongs_to_many :users end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 73c8d93..822e641 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -26,14 +26,6 @@ class Tournament < ActiveRecord::Base end class Settings - @vartypes = { - :true_false => 0, - :integer => 1, - :string => 2, - :select => 3, - :range => 4 - } - def initialize(tournament) @tournament = tournament end diff --git a/config/routes.rb b/config/routes.rb index 8c91ee1..8ec4432 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ +# -*- Mode: Ruby; Ruby-indent-level: 2; Indent-tabs-mode: nil -*- Leaguer::Application.routes.draw do resources :brackets @@ -17,6 +18,7 @@ Leaguer::Application.routes.draw do #match 'simple_captcha/:id', :to => 'simple_captcha#show', :as => :simple_captcha resources :teams + resources :tournaments do resources :matches, only: [:index, :show, :update] end diff --git a/generate.sh b/generate.sh index b8651c2..e965fde 100755 --- a/generate.sh +++ b/generate.sh @@ -21,8 +21,8 @@ bundle exec rails generate delayed_job:active_record # The whole shebang, models, views, and controllers bundle exec rails generate scaffold server default_user_permissions:integer -bundle exec rails generate scaffold match status:integer tournament_stage:references name:string winner:references remote_id:string submitted_peer_evaluations:integer -bundle exec rails generate scaffold team match:references +bundle exec rails generate scaffold match status:integer tournament_stage:references winner:references remote_id:text submitted_peer_evaluations:integer +bundle exec rails generate scaffold team bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text bundle exec rails generate scaffold tournament game:references status:integer name:string:uniq 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 sampling_method:string @@ -60,9 +60,6 @@ bundle exec rails generate controller static # not stick these in the views or anything. bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string permissions:integer -#for the tournament controller to generate options -#bundle exec rails generate scaffold - bundle exec rake db:drop bundle exec rake db:migrate bundle exec rake db:seed |