aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Arndt <parndt@gmail.com>2010-08-11 16:38:53 +1200
committerPhilip Arndt <parndt@gmail.com>2010-08-11 16:38:53 +1200
commitac0b754237045f6139106bd04e56b398e89ff9bd (patch)
tree3c532102404c5f796e22c691b7bb71bd1d080edd
parent64c036501c9cd6f1ddd98dbfdfdf0436ed706283 (diff)
downloadrefinerycms-blog-ac0b754237045f6139106bd04e56b398e89ff9bd.tar.gz
refinerycms-blog-ac0b754237045f6139106bd04e56b398e89ff9bd.tar.bz2
refinerycms-blog-ac0b754237045f6139106bd04e56b398e89ff9bd.zip
Adds unmoderated support through changing approved to state.
-rw-r--r--app/controllers/admin/blog/comments_controller.rb5
-rw-r--r--app/models/blog_comment.rb5
-rw-r--r--generators/refinery_blog/refinery_blog_generator.rb2
3 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/admin/blog/comments_controller.rb b/app/controllers/admin/blog/comments_controller.rb
index 4c3487c..ba9593a 100644
--- a/app/controllers/admin/blog/comments_controller.rb
+++ b/app/controllers/admin/blog/comments_controller.rb
@@ -2,6 +2,11 @@ class Admin::Blog::CommentsController < Admin::BaseController
crudify :blog_comment, :title_attribute => :name, :order => 'created_at DESC'
+ def index
+ @blog_comments = BlogComment.unmoderated
+ render :action => 'index'
+ end
+
def approved
@blog_comments = BlogComment.approved
render :action => 'index'
diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index d9e1917..cab2227 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -4,8 +4,9 @@ class BlogComment < ActiveRecord::Base
acts_as_indexed :fields => [:name, :email, :body]
- named_scope :approved, :conditions => {:approved => true}
- named_scope :rejected, :conditions => {:approved => false}
+ named_scope :unmoderated, :conditions => {:state => nil}
+ named_scope :approved, :conditions => {:state => 'approved'}
+ named_scope :rejected, :conditions => {:state => 'rejected'}
module Moderation
class << self
diff --git a/generators/refinery_blog/refinery_blog_generator.rb b/generators/refinery_blog/refinery_blog_generator.rb
index d18268b..304ea39 100644
--- a/generators/refinery_blog/refinery_blog_generator.rb
+++ b/generators/refinery_blog/refinery_blog_generator.rb
@@ -31,7 +31,7 @@ class RefineryBlogGenerator < Rails::Generator::NamedBase
Rails::Generator::GeneratedAttribute.new('name', 'string'),
Rails::Generator::GeneratedAttribute.new('email', 'string'),
Rails::Generator::GeneratedAttribute.new('body', 'text'),
- Rails::Generator::GeneratedAttribute.new('approved', 'boolean'),
+ Rails::Generator::GeneratedAttribute.new('state', 'string'),
Rails::Generator::GeneratedAttribute.new('blog_post_id', 'integer')
], :id => true
},{