cafe-grader-web Commit - r285:011d92099790

cafe-grader-web

parent | child

Description:

shows only enabled contests, ordered by name

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r285:011d92099790 - Mon, 08 Mar 2010 00:10:10 - 3 files changed: 4 inserted, 2 deleted

app/controllers/main_controller.rb ¶ +1 -1

                   else
                     @announcements = Announcement.find_published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def problem_list_by_user_contests(user)
                   contest_problems = []
                   pin = {}
-            -     user.contests.each do |contest|
+            +     user.contests.enabled.each do |contest|
                     available_problems = contest.problems.available
                     contest_problems << {
                       :contest => contest,
                       :problems => available_problems
                     }
                     available_problems.each {|p| pin[p.id] = true}
                   end
                   other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                   contest_problems << {
                     :contest => nil,
                     :problems => other_avaiable_problems
                   }

app/models/contest.rb ¶ +2

               class Contest < ActiveRecord::Base
                 has_and_belongs_to_many :users
                 has_and_belongs_to_many :problems
+            +   named_scope :enabled, :conditions => {:enabled => true}
+            +
               end

app/models/user.rb ¶ +1 -1

                          :order => 'created_at DESC'
                 has_many :replied_messages,
                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
-            -   has_and_belongs_to_many :contests, :uniq => true
+            +   has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
                 named_scope :activated_users, :conditions => {:activated => true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings