effective_resources 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22b266fe036432aaf679e5a695edcea2d17639a1bc5e1fa082d93b1317cdd1e7
-  data.tar.gz: dc3b135919307b5735aa5f34bb79633fa1532f2dbe9702ad995fad89e8886d7f
+  metadata.gz: 5bbe9d2d397b7aa15ce5eac7e06195ea31bed308e6f11e1f3a5b0842228c4a3e
+  data.tar.gz: 347ae76d73478afb5130a71a030f293830a2450b567a4ce2cbbd03dd94c90e2a
 SHA512:
-  metadata.gz: 757ba49ce72d18d953634a6baf91b4f71292cf04a55475808ef417970697470531d2f06c7db77356f2768f95c7fd85c05d3fde186b0c1a125f927e8af2882687
-  data.tar.gz: dea57f166262cbeeb8e43d7c2e730ab0b59c1eb43bc31e67f29801055128425c9414397d3050a508fb8872021280a5818da8fc7b087493d525040d03464609f9
+  metadata.gz: 71e9a722f002120691c88aa70ffba6b7892f29c6fc6d3d9f78e894c2ae8a421543a26fa2d77001a95fea0161f7de64cd755d9ea3c78fc78976e48ba1ad36e1d3
+  data.tar.gz: 6ec2a9c001636a0274c02d48baf192a0640b1cace67b07a71f7cd6bba7ea1c96ae65d28f62fc8f9bfcfaedc51ad78c5cc3f9815e9bea15fffd9ea8a5c7a2c8c2

data/app/helpers/effective_resources_helper.rb

@@ -293,4 +293,12 @@ module EffectiveResourcesHelper
     end
   end
 
+  def return_to_dashboard_path
+    path = (Tenant.routes.dashboard_path rescue nil) if defined?(Tenant) && Tenant.routes.respond_to?(:dashboard_path)
+    path ||= (main_app.dashboard_path rescue nil) if main_app.respond_to?(:dashboard_path)
+    path ||= (main_app.root_path rescue nil) if main_app.respond_to?(:root_path)
+
+    path || '/'
+  end
+
 end

data/app/helpers/effective_resources_private_helper.rb

@@ -36,20 +36,20 @@ module EffectiveResourcesPrivateHelper
       end
 
       # Replace resource name in any token strings
-      if opts['data-confirm'].present? && opts['data-confirm'].include?('@resource'.freeze)
-        opts['data-confirm'] = opts['data-confirm'].gsub('@resource'.freeze, resource_to_s)
+      if opts.key?('data-confirm') && opts['data-confirm'].to_s.include?('@resource')
+        opts['data-confirm'] = opts['data-confirm'].gsub('@resource', resource_to_s)
       end
 
       # Assign class
       opts[:class] ||= (
-        if opts['data-method'.freeze] == 'delete'.freeze
-          'btn btn-danger'.freeze
+        if opts['data-method'].to_s == 'delete'
+          'btn btn-danger'
         elsif h.length == 0
-          'btn btn-primary'.freeze
+          'btn btn-primary'
         elsif defined?(EffectiveBootstrap)
-          'btn btn-secondary'.freeze
+          'btn btn-secondary'
         else
-          'btn btn-default'.freeze
+          'btn btn-default'
         end
       )
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails