Merge pull request #15 from workgena/redirect

Optional redirect_to(url) after action

Author: Fivell

README.md

@@ -146,12 +146,18 @@ config.scoped_collection_actions_if = -> { params[:scope] }
 ### Can I use my handler on update/delete action?
 
 You can pass block to default actions update and delete.
+And do custom redirect after it. Use render(location: 'somethin') instead of redirect_to().
+
+This example renders form which allows to change "name" field. And after it do redirect to dashboard page.
 
 ```ruby
-  # Delte absolutely all
-  scoped_collection_action :scoped_collection_destroy do
-    Phone.all.delete_all
-    render nothing: true, status: :no_content
+  scoped_collection_action :scoped_collection_update,
+                           form: -> {
+                             {name: 'text'}
+                           } do
+    scoped_collection_records.update_all(name: params[:changes][:name])
+    flash[:notice] = 'Name successfully changed.'
+    render nothing: true, status: :no_content, location: admin_dashboard_path
   end
 ```
 
@@ -163,7 +169,7 @@ Example:
 
 ```ruby
   scoped_collection_action :erase_date, title: 'Nullify' do
-    batch_action_collection.update_all(manufactured_at: nil)
+    scoped_collection_records.update_all(manufactured_at: nil)
   end
 ```
 
@@ -255,7 +261,7 @@ Example with erasing phone diagonal. In this case you Phone-model has validation
 ```ruby
   scoped_collection_action :change_diagonal, form: { diagonal: 'text' }  do
     errors = []
-    batch_action_collection.find_each do |record|
+    scoped_collection_records.find_each do |record|
       errors << "#{record.errors.full_messages.join('. ')}" unless record.update(diagonal: params[:changes][:diagonal])
     end
     if errors.empty?

lib/active_admin_scoped_collection_actions/dsl.rb

@@ -26,24 +26,22 @@ def add_scoped_collection_action_default_update(options, &block)
           render nothing: true, status: :no_content and next
         end
         permitted_changes = params.require(:changes).permit(*(options[:form].call.keys))
-        errors = []
         if block_given?
-          begin
-            instance_eval &block
-          rescue Exception => e
-            errors << e
-          end
+          instance_eval &block
         else
+          errors = []
           scoped_collection_records.find_each do |record|
-            errors << "#{record.attributes[resource_class.primary_key]} | #{record.errors.full_messages.join('. ')}" unless update_resource(record, [permitted_changes])
+            unless update_resource(record, [permitted_changes])
+              errors << "#{record.attributes[resource_class.primary_key]} | #{record.errors.full_messages.join('. ')}"
+            end
           end
+          if errors.empty?
+            flash[:notice] = 'Batch update done'
+          else
+            flash[:error] = errors.join(". ")
+          end
+          render nothing: true, status: :no_content
         end
-        if errors.empty?
-          flash[:notice] = 'Batch update done'
-        else
-          flash[:error] = errors.join(". ")
-        end
-        render nothing: true, status: :no_content
       end
     end
 
@@ -54,28 +52,25 @@ def add_scoped_collection_action_default_destroy(_, &block)
           flash[:error] = 'Access denied'
           render nothing: true, status: :no_content and next
         end
-        errors = []
         if block_given?
-          begin
-            instance_eval &block
-          rescue Exception => e
-            errors << e
-          end
+          instance_eval &block
         else
+          errors = []
           scoped_collection_records.find_each do |record|
-            errors << "#{record.attributes[resource_class.primary_key]} | Cant be destroyed}" unless destroy_resource(record)
+            unless destroy_resource(record)
+              errors << "#{record.attributes[resource_class.primary_key]} | Cant be destroyed}"
+            end
           end
+          if errors.empty?
+            flash[:notice] = 'Batch destroy done'
+          else
+            flash[:error] = errors.join(". ")
+          end
+          render nothing: true, status: :no_content
         end
-        if errors.empty?
-          flash[:notice] = 'Batch destroy done'
-        else
-          flash[:error] = errors.join(". ")
-        end
-        render nothing: true, status: :no_content
       end
     end
 
 
-
   end
 end

lib/active_admin_scoped_collection_actions/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminScopedCollectionActions
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

vendor/assets/javascripts/active_admin_scoped_collection_actions.js.coffee

@@ -18,5 +18,8 @@ $(document).ready ->
         $('.paginated_collection').find('input.collection_selection:checked').each (i, el) ->
           form_data["collection_selection"].push($(el).val())
 
-        $.post(url, form_data).always () ->
-          window.location.reload()
+        $.post(url, form_data).always (data, textStatus, jqXHR) ->
+          if jqXHR.getResponseHeader('Location')
+            window.location.assign jqXHR.getResponseHeader('Location')
+          else
+            window.location.reload()