effective_resources 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89ee5768e0e064df020dfd0da3110e601fa51dd100d10a909442279c5e85465e
-  data.tar.gz: 03d67a2c0228472542671b781ba00a16fd3959e541adc4d1e9beeaf3e23d2b58
+  metadata.gz: e85d51e9a321bc50d365988828721b264bd2ef27476a9d3cb3650217f5b130e3
+  data.tar.gz: a98e8d5ba21daa4519e5167b7c19a07bc61d4a3fc21d1b297e67eb19f558dc3b
 SHA512:
-  metadata.gz: 143e22c3e4df4f5937fefd00963d97e483e4d6355ad13367a3a1e64a74c0a32541cd5d2fe3100e728fa839e15ff32dc6f5c4b716ce69dd718b8d53b43a15b899
-  data.tar.gz: 2dba5416763bec7476ffd586dbade4dd44fc21eb3112580c09b470eb5bf719a18116294e8f5c2afcb85e80d48a459d80a91734e27f68e342af6a9b7238c7b4da
+  metadata.gz: 4e8cf35a3218e404cb37510c2c3b0bfb966a73f85850cd5cd5f7aced1ea024dd505b07f1994d58b5ed2ad81c8ca1daf16898f9bd26c1d88f4fe57ce4c21e278d
+  data.tar.gz: c6fdf528e8a9f8ace078e51410483b0d4f8f4c2bddb367b0559ccc7965181d58668acad33db847c32484e3e215464390df7c01728fd4c8a8cd8064a76432a5bf

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

@@ -60,7 +60,9 @@ module Effective
             when ActiveRecord::StaleObjectError
               flash.now[:danger] = "#{flash.now[:danger]} <a href='#', class='alert-link' onclick='window.location.reload(true); return false;'>reload page and try again</a>"
               raise(ActiveRecord::Rollback) # This is a soft error, we want to display the flash message to user
-            when Effective::ActionFailed, ActiveRecord::RecordInvalid, RuntimeError
+            when Effective::ActionFailed
+              # Nothing to do
+            when ActiveRecord::RecordInvalid, RuntimeError
               raise(ActiveRecord::Rollback) # This is a soft error, we want to display the flash message to user
             else
               raise(e) # This is a real error that should be sent to 500. Client should not see the message.

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

@@ -126,10 +126,13 @@ module Effective
     end
 
     def resource_layout
+      namespace = controller_path.include?('admin/') ? 'admin' : 'application'
+
       if defined?(Tenant)
-        namespace = controller_path.include?('admin/') ? 'admin' : 'application'
-        "#{Tenant.current}/#{namespace}"
+        return "#{Tenant.current}/#{namespace}"
       end
+
+      namespace
     end
 
     def resource_params_method_name

data/lib/effective_resources/engine.rb

@@ -21,7 +21,7 @@ module EffectiveResources
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_resources.active_record' do |app|
-      ActiveSupport.on_load :active_record do
+      app.config.to_prepare do
         ActiveRecord::Base.extend(ActsAsArchived::Base)
         ActiveRecord::Base.extend(ActsAsEmailForm::Base)
         ActiveRecord::Base.extend(ActsAsTokened::Base)
@@ -38,7 +38,7 @@ module EffectiveResources
     end
 
     initializer 'effective_resources.cancancan' do |app|
-      ActiveSupport.on_load :active_record do
+      app.config.to_prepare do
         if defined?(CanCan::Ability)
           CanCan::Ability.module_eval do
             CRUD_ACTIONS = [:index, :new, :create, :edit, :update, :show, :destroy]
@@ -64,8 +64,10 @@ module EffectiveResources
 
     # Register the flash_messages concern so that it can be called in ActionController
     initializer 'effective_resources.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        include(Effective::FlashMessages)
+      app.config.to_prepare do
+        ActiveSupport.on_load :action_controller do
+          include(Effective::FlashMessages)
+        end
       end
     end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.17.0'.freeze
+  VERSION = '1.18.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails