diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
| commit | db45b2441bd57a5e640b529ef6239c98a3030fe2 (patch) | |
| tree | bcffce81e433821f6ddd9a6588b40ee1d5f84592 /app/models | |
| parent | 4aeaf0e41518695c3c6ba3b09025516f67b06a11 (diff) | |
| parent | 474a048ae4a4fae86e7fde93745f0ea79c7ed717 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/match.rb | 2 | ||||
| -rw-r--r-- | app/models/statistic.rb (renamed from app/models/score.rb) | 2 | ||||
| -rw-r--r-- | app/models/tournament_stage.rb | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/models/match.rb b/app/models/match.rb index 83d7d72..20a36a5 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,5 +1,5 @@ class Match < ActiveRecord::Base - belongs_to :tournament + belongs_to :tournament_stage has_many :scores has_and_belongs_to_many :teams diff --git a/app/models/score.rb b/app/models/statistic.rb index 11ee9a6..341fd9d 100644 --- a/app/models/score.rb +++ b/app/models/statistic.rb @@ -1,4 +1,4 @@ -class Score < ActiveRecord::Base +class Statistic < ActiveRecord::Base belongs_to :user belongs_to :match end diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb new file mode 100644 index 0000000..205c8cc --- /dev/null +++ b/app/models/tournament_stage.rb @@ -0,0 +1,3 @@ +class TournamentStage < ActiveRecord::Base + belongs_to :tournament +end |