effective_resources 2.20.0 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7425b10dfe261701d61c87772c9c031c6a38521e02c910833b30f2fb8238f3f8
-  data.tar.gz: 265b68c8132d30d8b4fa3b7335dbfe889033c2565adeaa48ddd65a08f29ee92e
+  metadata.gz: d425bc9d1bc016b9979350a67a3dbeb8432d292bf627efcf5c01ac0512587b24
+  data.tar.gz: 678f168202e93a74102a713b39a57de79531c7c9cc36ac3f5e9b210657749592
 SHA512:
-  metadata.gz: 0cc236d30dfa1523911297c17587a3a575238a25269836d24614b513408c8be88d7795d6985c63b167a2401805bc5d603d81c85a934bcc58063851c8fa7d7369
-  data.tar.gz: 74a40cc66f62880522ade26fa0133cacf2c4f795e2dc0e742560ef2227c570a665482c0b87514728c2da9d2f16bf944654f28b7c1b5696de2434bb03bf4ce726
+  metadata.gz: ad93fbed04f488d6ba4061d9db1cc72e75831fbf083949576365d6046af692a3149f28aa4361285f37dbc4099a221a17777232a3263156a218394e4283b75137
+  data.tar.gz: c2ba9f5df09a3ad3bb6693d8501bbe11c1c53576d68b844e9fab620d92531847ccd172a81bf2881ec571acc44cabb944f7bffa81508c7e143c532accb25bf497

data/app/controllers/concerns/effective/crud_controller/paths.rb

@@ -69,6 +69,29 @@ module Effective
         root_path
       end
 
+      def resource_redirect_error_path(resource, action)
+        submit = commit_action(action)
+        redirect = submit[:redirect_error].respond_to?(:call) ? instance_exec(&submit[:redirect_error]) : submit[:redirect_error]
+
+        # If we have a specific redirect for it
+        commit_action_redirect = case redirect
+          when :index     ; resource_index_path
+          when :edit      ; resource_edit_path
+          when :show      ; resource_show_path
+          when :new       ; resource_new_path
+          when :duplicate ; resource_duplicate_path
+          when :back      ; referer_redirect_path
+          when :save      ; [resource_edit_path, resource_show_path].compact.first
+          when Symbol     ; resource_action_path(redirect)
+          when String     ; redirect
+          else            ; nil
+        end
+
+        return commit_action_redirect if commit_action_redirect.present?
+
+        resource_redirect_path(resource, action)
+      end
+
       def referer_redirect_path
         url = request.referer.to_s
 
@@ -96,6 +119,11 @@ module Effective
         (submit[:redirect].respond_to?(:call) ? instance_exec(&submit[:redirect]) : submit[:redirect]).present?
       end
 
+      def specific_redirect_error_path?(action = nil)
+        submit = commit_action(action)
+        (submit[:redirect_error].respond_to?(:call) ? instance_exec(&submit[:redirect_error]) : submit[:redirect_error]).present?
+      end
+
       def resource_index_path
         effective_resource.action_path(:index)
       end

data/app/controllers/concerns/effective/crud_controller/respond.rb

@@ -60,35 +60,49 @@ module Effective
         flash.delete(:success)
         flash.now[:danger] ||= resource_flash(:danger, resource, action)
 
-        respond_to do |format|
-          case action_name.to_sym
-          when :create
-            format.html { render :new }
-          when :update
-            format.html { render :edit }
-          when :destroy
+        if specific_redirect_error_path?(action)
+          respond_to do |format| 
             format.html do
               redirect_flash
-              redirect_to(resource_redirect_path(resource, action))
+              redirect_to(resource_redirect_error_path(resource, action))
             end
-          else
-            if template_present?(action)
-              format.html { render(action, locals: { action: action }) }
-            elsif request.referer.to_s.end_with?('/edit')
-              format.html { render :edit }
-            elsif request.referer.to_s.end_with?('/new')
+
+            format.js do
+              view = template_present?(action) ? action : :member_action
+              render(view, locals: { action: action }) # action.js.erb
+            end
+          end
+        else
+          respond_to do |format| # Default
+            case action_name.to_sym
+            when :create
               format.html { render :new }
-            else
+            when :update
+              format.html { render :edit }
+            when :destroy
               format.html do
                 redirect_flash
                 redirect_to(resource_redirect_path(resource, action))
               end
+            else
+              if template_present?(action)
+                format.html { render(action, locals: { action: action }) }
+              elsif request.referer.to_s.end_with?('/edit')
+                format.html { render :edit }
+              elsif request.referer.to_s.end_with?('/new')
+                format.html { render :new }
+              else
+                format.html do
+                  redirect_flash
+                  redirect_to(resource_redirect_path(resource, action))
+                end
+              end
             end
-          end
 
-          format.js do
-            view = template_present?(action) ? action : :member_action
-            render(view, locals: { action: action }) # action.js.erb
+            format.js do
+              view = template_present?(action) ? action : :member_action
+              render(view, locals: { action: action }) # action.js.erb
+            end
           end
         end
       end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.20.0'.freeze
+  VERSION = '2.20.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.20.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails