diff options
author | Philip Arndt <parndt@gmail.com> | 2012-07-06 12:52:10 -0700 |
---|---|---|
committer | Philip Arndt <parndt@gmail.com> | 2012-07-06 12:52:10 -0700 |
commit | 213f7f20ef83736f2f63cc36b1a2b7a87eba10d6 (patch) | |
tree | 13a7bcb43ea3321839b71ac340a4c2ea02bff8a1 /app/controllers/refinery/blog/admin/comments_controller.rb | |
parent | e41a230b3bb30e3ccf92cce14a692bf204ec28c7 (diff) | |
parent | dd3480f8dcf96038c73e00df872987ea9a15eb2b (diff) | |
download | refinerycms-blog-213f7f20ef83736f2f63cc36b1a2b7a87eba10d6.tar.gz refinerycms-blog-213f7f20ef83736f2f63cc36b1a2b7a87eba10d6.tar.bz2 refinerycms-blog-213f7f20ef83736f2f63cc36b1a2b7a87eba10d6.zip |
Merge pull request #251 from resolve/split_approved_rejected_actions
Split rejected and approved comment actions into separate controller act...
Diffstat (limited to 'app/controllers/refinery/blog/admin/comments_controller.rb')
-rw-r--r-- | app/controllers/refinery/blog/admin/comments_controller.rb | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/app/controllers/refinery/blog/admin/comments_controller.rb b/app/controllers/refinery/blog/admin/comments_controller.rb index 18246ee..ce4ac70 100644 --- a/app/controllers/refinery/blog/admin/comments_controller.rb +++ b/app/controllers/refinery/blog/admin/comments_controller.rb @@ -16,31 +16,31 @@ module Refinery end def approved - unless params[:id].present? - @comments = Refinery::Blog::Comment.approved.page(params[:page]) + @comments = Refinery::Blog::Comment.approved.page(params[:page]) - render :index - else - @comment = Refinery::Blog::Comment.find(params[:id]) - @comment.approve! - flash[:notice] = t('approved', :scope => 'refinery.blog.admin.comments', :author => @comment.name) + render :index + end + + def approve + @comment = Refinery::Blog::Comment.find(params[:id]) + @comment.approve! + flash[:notice] = t('approved', :scope => 'refinery.blog.admin.comments', :author => @comment.name) - redirect_to refinery.url_for(:action => params[:return_to] || 'index', :id => nil) - end + redirect_to refinery.blog_admin_comments_path end def rejected - unless params[:id].present? - @comments = Refinery::Blog::Comment.rejected.page(params[:page]) + @comments = Refinery::Blog::Comment.rejected.page(params[:page]) + + render :index + end - render :index - else - @comment = Refinery::Blog::Comment.find(params[:id]) - @comment.reject! - flash[:notice] = t('rejected', :scope => 'refinery.blog.admin.comments', :author => @comment.name) + def reject + @comment = Refinery::Blog::Comment.find(params[:id]) + @comment.reject! + flash[:notice] = t('rejected', :scope => 'refinery.blog.admin.comments', :author => @comment.name) - redirect_to refinery.url_for(:action => params[:return_to] || 'index', :id => nil) - end + redirect_to refinery.blog_admin_comments_path end end |