Merge pull request #2776 from chamun/destroy_record_from_index_page_status_code_404

Return status code 200 when destroying a record from the index page fails

Author: mshibuya

app/controllers/rails_admin/application_controller.rb

@@ -63,12 +63,14 @@ def rails_admin_controller?
     rescue_from RailsAdmin::ObjectNotFound do
       flash[:error] = I18n.t('admin.flash.object_not_found', model: @model_name, id: params[:id])
       params[:action] = 'index'
+      @status_code = :not_found
       index
     end
 
     rescue_from RailsAdmin::ModelNotFound do
       flash[:error] = I18n.t('admin.flash.model_not_found', model: @model_name)
       params[:action] = 'dashboard'
+      @status_code = :not_found
       dashboard
     end
   end

lib/rails_admin/config/actions/dashboard.rb

@@ -30,7 +30,7 @@ class Dashboard < RailsAdmin::Config::Actions::Base
                 @most_recent_created[t.model.name] = t.model.last.try(:created_at)
               end
             end
-            render @action.template_name, status: (flash[:error].present? ? :not_found : 200)
+            render @action.template_name, status: @status_code || :ok
           end
         end
 

lib/rails_admin/config/actions/index.rb

@@ -41,7 +41,7 @@ class Index < RailsAdmin::Config::Actions::Base
 
             respond_to do |format|
               format.html do
-                render @action.template_name, status: (flash[:error].present? ? :not_found : 200)
+                render @action.template_name, status: @status_code || :ok
               end
 
               format.json do

spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb

@@ -39,6 +39,10 @@
     it 'shows error message' do
       is_expected.to have_content('Player failed to be deleted')
     end
+
+    it 'returns status code 200' do
+      expect(page.status_code).to eq(200)
+    end
   end
 
   describe 'destroy' do
@@ -88,4 +92,20 @@
       expect(URI.parse(page.current_url).path).to eq(show_path(model_name: 'player', id: @player.id))
     end
   end
+
+  describe 'destroy from index page' do
+    it 'returns status code 200' do
+      if Rails.version >= '5.0'
+        allow_any_instance_of(Player).to receive(:destroy_hook) { throw :abort }
+      else
+        allow_any_instance_of(Player).to receive(:destroy_hook).and_return false
+      end
+      @player = FactoryGirl.create :player
+      visit index_path(model_name: 'player')
+      click_link 'Delete'
+      click_button "Yes, I'm sure"
+
+      expect(page.status_code).to eq(200)
+    end
+  end
 end