diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/blog_comment.rb | 12 | ||||
| -rw-r--r-- | app/models/blog_post.rb | 22 |
2 files changed, 17 insertions, 17 deletions
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb index 9b84ece..7a4af50 100644 --- a/app/models/blog_comment.rb +++ b/app/models/blog_comment.rb @@ -54,7 +54,7 @@ class BlogComment < ActiveRecord::Base class << self def enabled? RefinerySetting.find_or_set(:comment_moderation, true, { - :scoping => :blog, + :scoping => 'blog', :restricted => false }) end @@ -62,7 +62,7 @@ class BlogComment < ActiveRecord::Base def toggle! new_value = { :value => !BlogComment::Moderation.enabled?, - :scoping => :blog, + :scoping => 'blog', :restricted => false } if RefinerySetting.respond_to?(:set) @@ -79,7 +79,7 @@ class BlogComment < ActiveRecord::Base def recipients RefinerySetting.find_or_set(:comment_notification_recipients, (Role[:refinery].users.first.email rescue ''), { - :scoping => :blog, + :scoping => 'blog', :restricted => false }) end @@ -87,7 +87,7 @@ class BlogComment < ActiveRecord::Base def recipients=(emails) new_value = { :value => emails, - :scoping => :blog, + :scoping => 'blog', :restricted => false } if RefinerySetting.respond_to?(:set) @@ -99,7 +99,7 @@ class BlogComment < ActiveRecord::Base def subject RefinerySetting.find_or_set(:comment_notification_subject, "New inquiry from your website", { - :scoping => :blog, + :scoping => 'blog', :restricted => false }) end @@ -107,7 +107,7 @@ class BlogComment < ActiveRecord::Base def subject=(subject_line) new_value = { :value => subject_line, - :scoping => :blog, + :scoping => 'blog', :restricted => false } if RefinerySetting.respond_to?(:set) diff --git a/app/models/blog_post.rb b/app/models/blog_post.rb index 471be72..b965e5d 100644 --- a/app/models/blog_post.rb +++ b/app/models/blog_post.rb @@ -9,7 +9,7 @@ class BlogPost < ActiveRecord::Base validates_uniqueness_of :title has_friendly_id :title, :use_slug => true - + if Rails.version < '3.0.0' named_scope :by_archive, lambda { |archive_date| {:conditions => ['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month], :order => "published_at DESC"} } else @@ -17,7 +17,7 @@ class BlogPost < ActiveRecord::Base where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month]).order("published_at DESC") } end - + if Rails.version < '3.0.0' named_scope :all_previous, :conditions => ['published_at <= ?', Time.now.beginning_of_month], :order => "published_at DESC" else @@ -29,7 +29,7 @@ class BlogPost < ActiveRecord::Base else scope :live, lambda { where( "published_at < ? and draft = ?", Time.now, false).order("published_at DESC") } end - + if Rails.version < '3.0.0' named_scope :previous, lambda { |i| { :conditions => ["published_at < ?", i.published_at], :order => "published_at DESC", :limit => 1 } } named_scope :next, lambda { |i| { :condtions => ["published_at > ?", i.published_at], :order => "published_at ASC", :limit => 1 } } @@ -37,7 +37,7 @@ class BlogPost < ActiveRecord::Base scope :previous, lambda { |i| where(["published_at < ?", i.published_at]).order("published_at DESC").limit(1) } scope :next, lambda { |i| where(["published_at > ?", i.published_at]).order("published_at ASC").limit(1) } end - + def next self.class.next(self).first end @@ -45,11 +45,11 @@ class BlogPost < ActiveRecord::Base def prev self.class.previous(self).first end - + def live? !draft and published_at <= Time.now end - + def category_ids=(ids) self.categories = ids.reject{|id| id.blank?}.collect {|c_id| BlogCategory.find(c_id.to_i) rescue nil @@ -59,21 +59,21 @@ class BlogPost < ActiveRecord::Base class << self def comments_allowed? RefinerySetting.find_or_set(:comments_allowed, true, { - :scoping => :blog + :scoping => 'blog' }) end end - + module ShareThis DEFAULT_KEY = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" - + class << self def key RefinerySetting.find_or_set(:share_this_key, BlogPost::ShareThis::DEFAULT_KEY, { - :scoping => :blog + :scoping => 'blog' }) end - + def enabled? key = BlogPost::ShareThis.key key.present? and key != BlogPost::ShareThis::DEFAULT_KEY |