From 8d776b66a54ddee0dd885bba1b91626b52fd509f Mon Sep 17 00:00:00 2001 From: Alberto Molpeceres Date: Thu, 4 Jun 2009 11:10:15 +0200 Subject: [PATCH] story published and archived named_scopes changed to use lambdas --- app/models/story.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/story.rb b/app/models/story.rb index 669e130..f9ce1f1 100644 --- a/app/models/story.rb +++ b/app/models/story.rb @@ -10,11 +10,11 @@ class Story < ActiveRecord::Base belongs_to :owner, :class_name => "User", :foreign_key => "user_id" named_scope :draft, :conditions => ['state = ?', 'draft'] - named_scope :archived, :conditions => ['archive_date <= ?', Date.today] - named_scope :published, :conditions => ['publish_date <= ? and archive_date > ?', Date.today, Date.today] - + + named_scope :archived, lambda { |*args| { :conditions => ['archive_date <= ?', args.first || Date.today] } } + named_scope :published, lambda { |*args| { :conditions => ['publish_date <= ? and archive_date > ?', args.first || Date.today, args.last || Date.today] } } + named_scope :site, :conditions => ['portal = ?', true] - validates_presence_of :title, :body