cafe-grader-web

Commit r285:011d92099790 public

parent | child
Description:
shows only enabled contests, ordered by name
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r285:011d92099790 - - 3 files changed: 4 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -193,13 +193,13
193 end
193 end
194 end
194 end
195
195
196 def problem_list_by_user_contests(user)
196 def problem_list_by_user_contests(user)
197 contest_problems = []
197 contest_problems = []
198 pin = {}
198 pin = {}
199 - user.contests.each do |contest|
199 + user.contests.enabled.each do |contest|
200 available_problems = contest.problems.available
200 available_problems = contest.problems.available
201 contest_problems << {
201 contest_problems << {
202 :contest => contest,
202 :contest => contest,
203 :problems => available_problems
203 :problems => available_problems
204 }
204 }
205 available_problems.each {|p| pin[p.id] = true}
205 available_problems.each {|p| pin[p.id] = true}
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,6 +1,8
1 class Contest < ActiveRecord::Base
1 class Contest < ActiveRecord::Base
2
2
3 has_and_belongs_to_many :users
3 has_and_belongs_to_many :users
4 has_and_belongs_to_many :problems
4 has_and_belongs_to_many :problems
5
5
6 + named_scope :enabled, :conditions => {:enabled => true}
7 +
6 end
8 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -18,13 +18,13
18
18
19 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
19 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
20
20
21 belongs_to :site
21 belongs_to :site
22 belongs_to :country
22 belongs_to :country
23
23
24 - has_and_belongs_to_many :contests, :uniq => true
24 + has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
25
25
26 named_scope :activated_users, :conditions => {:activated => true}
26 named_scope :activated_users, :conditions => {:activated => true}
27
27
28 validates_presence_of :login
28 validates_presence_of :login
29 validates_uniqueness_of :login
29 validates_uniqueness_of :login
30 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
30 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
You need to be logged in to leave comments. Login now