diff --git a/app/models/announcement.rb b/app/models/announcement.rb --- a/app/models/announcement.rb +++ b/app/models/announcement.rb @@ -1,9 +1,15 @@ class Announcement < ActiveRecord::Base - def self.find_published - Announcement.find(:all, - :conditions => "(published = 1) AND (frontpage = 0)", - :order => "created_at DESC") + def self.find_published(contest_started=false) + if contest_started + Announcement.find(:all, + :conditions => "(published = 1) AND (frontpage = 0)", + :order => "created_at DESC") + else + Announcement.find(:all, + :conditions => "(published = 1) AND (frontpage = 0) AND (contest_only = 0)", + :order => "created_at DESC") + end end def self.find_for_frontpage