fixes #2448: Approvers can undelete posts they already approved/uploaded

2015-07-24 14:19:40 -07:00
parent 9fb68cee94
commit abb232d4e6
3 changed files with 40 additions and 2 deletions
--- a/app/controllers/moderator/post/posts_controller.rb
+++ b/app/controllers/moderator/post/posts_controller.rb
@@ -3,7 +3,7 @@ module Moderator
    class PostsController < ApplicationController
      before_filter :moderator_only, :only => [:delete, :undelete, :move_favorites, :ban, :unban, :confirm_delete, :confirm_move_favorites, :confirm_ban]
      before_filter :admin_only, :only => [:expunge]
-      rescue_from ::PostFlag::Error, :with => :rescue_exception
+      rescue_from ::PostFlag::Error, ::Post::ApprovalError, :with => :rescue_exception

      def confirm_delete
        @post = ::Post.find(params[:id])