diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-24 17:58:22 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-24 17:58:22 -0400 |
commit | 76ee2a59964be6707cab25053697a2d848bbcd52 (patch) | |
tree | d9e815057b04cfb3af2b0c98ca3c2d1c808c4f3b /app/models | |
parent | 7fe1894becda038c3e85ba179dc27ce3b54690dc (diff) | |
parent | 976325f60e7706e480f3d45848897200734c8485 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/api_request.rb | 2 | ||||
-rw-r--r-- | app/models/api_requests.rb | 2 | ||||
-rw-r--r-- | app/models/tournament.rb | 12 |
3 files changed, 3 insertions, 13 deletions
diff --git a/app/models/api_request.rb b/app/models/api_request.rb new file mode 100644 index 0000000..ffb7267 --- /dev/null +++ b/app/models/api_request.rb @@ -0,0 +1,2 @@ +class ApiRequest < ActiveRecord::Base +end diff --git a/app/models/api_requests.rb b/app/models/api_requests.rb deleted file mode 100644 index 19c76e2..0000000 --- a/app/models/api_requests.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ApiRequests < ActiveRecord::Base -end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index e21ccb1..861be6c 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -1,20 +1,10 @@ class Tournament < ActiveRecord::Base belongs_to :game - has_many :tournament_stages + has_many :stages, class_name: "TournamentStage" has_many :settings_raw, class_name: "TournamentSetting" has_and_belongs_to_many :players, class_name: "User", association_foreign_key: "player_id", join_table: "players_tournaments" has_and_belongs_to_many :hosts, class_name: "User", association_foreign_key: "host_id", join_table: "hosts_tournaments" - def stages_ordered - h = {} - i = 1 - self.tournament_stages.order(:id).each do |s| - h[i] = s - i += 1 - end - return h - end - def settings @settings ||= Settings.new(self) end |