effective_datatables 4.19.0 → 4.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a3cae1554f2bcf9b6d73f51972eb1f8bc00c38a30d160c7f8910bf6e339a99
-  data.tar.gz: 72193d4f4895fa60a933c6be50d2d5d6a9d32d5d09a7f60558b130c2042eee1a
+  metadata.gz: 1f5e3d8ed9d497dea48da82cc800596e4b43500d7b85030d1fced300f846218d
+  data.tar.gz: c9b2b959192a337aa876830f1c4c9d7b5d6b8f58f89b1ca0812be995ab050e45
 SHA512:
-  metadata.gz: 321d799d2a21d4e3d19523ef8ae24d8ae62649bd1656afcc90223b26a77409d00dd8bd80a8f15bd40eb07476ea2b1f4a3eb7500f0f44a4a6b0b98553c873ba1d
-  data.tar.gz: f35dc8eeabe695ded08c56d80d1f09cfb18ac1e9925cf55d43870ac121d357543e085e9fdeb14020f92a52f6419de45712a0a663cb4429029ee3edcd9f29e9b4
+  metadata.gz: 3c045b22d3482ef816c21f157c7cf2fc113f6434a8f0f01a7467f3cff494b1d3dda4dbce680166dc5298c8bb5723f4b3b49ec22679a48c06db792d0752435f67
+  data.tar.gz: 250528bb18da5a76ba3d9c1d567d56bea5e58e8093f24bb23e55c8b6821e8f58c24c60a714e245bf5312d5de069c3aaef90d061eec161facefb72765b57c65fd

data/app/controllers/effective/datatables_controller.rb

@@ -15,7 +15,7 @@ module Effective
         EffectiveDatatables.authorize!(self, :index, @datatable.collection_class)
 
         render json: @datatable.to_json
-      rescue => e
+      rescue Exception => e
         EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class))
         render json: error_json(e)
 
@@ -84,7 +84,7 @@ module Effective
         render status: :ok, body: :ok
       rescue Effective::AccessDenied => e
         render(status: :unauthorized, body: 'Access Denied')
-      rescue => e
+      rescue Exception => e
         render(status: :error, body: 'Unexpected Error')
       end
 

data/app/models/effective/datatable_dsl_tool.rb

@@ -24,20 +24,16 @@ module Effective
         raise "#{method} block must be declared outside the datatable do ... end block"
       end
 
-      if datatable.respond_to?(method)
-        if block_given?
-          datatable.send(method, *args, **kwargs) { yield }
-        else
-          datatable.send(method, *args, **kwargs)
-        end
-      elsif view.respond_to?(method)
-        if block_given?
-          view.send(method, *args, **kwargs) { yield }
-        else
-          view.send(method, *args, **kwargs)
-        end
+      subject = datatable if datatable.respond_to?(method)
+      subject ||= view if view.respond_to?(method)
+      subject ||= Tenant.helpers if defined?(Tenant) && Tenant.helpers.respond_to?(method)
+
+      return super unless subject
+
+      if block_given?
+        subject.send(method, *args, **kwargs) { yield }
       else
-        super
+        subject.send(method, *args, **kwargs)
       end
     end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.19.0'.freeze
+  VERSION = '4.19.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.19.0
+  version: 4.19.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails