effective_datatables 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c62cd44b70abef44f1a3c287cb4bfac24ea5f9694b99186a1e29522b64d027
-  data.tar.gz: 523ab0b6f3f277e3dd4fc9043d7101620b180bd975ce31f249eb0f7f13f24f41
+  metadata.gz: 509cfa19dfd481e41030c2ba527e34b23b41fdd66485d53923317b43938e0f56
+  data.tar.gz: bfb1dcae3e580fcf1795290cbb543a68f741b2442484289b23f50c421ae98153
 SHA512:
-  metadata.gz: 0c83ba0be0f20ca89f85cbeddd7b8b4a868cdd9ce10f1ac714b07581db902432a06cb7394c43afa9c00700df0aed1dd7209ac6b2a1bafa314f1ce17d8bea56e9
-  data.tar.gz: e6cdd6944a465b63f059ee64e34c56a39a65bc4fa7a03e2f69bf4c55a4205d78d747a0bbc450e626d4c41a03629a774b2da91d601c110d2b0b26c497a40b73ee
+  metadata.gz: ea2b82022025d623e56b0b2b5425b2161dcc7ae4d7697cf46d132ca9216c217a555cf53d30bc47af88323ceb9dfaac42dbf9e97753a9114fb1742709f60aab51
+  data.tar.gz: ee06ea290b341b2047676f5dd79de2165483f8522c05c6f438d920e94ddb85d9fef63ba4795c6539e10bfb6c7486db308597cdd87daa173358d2dcd7476103aa

data/app/models/effective/datatable.rb

@@ -1,7 +1,7 @@
 module Effective
   class Datatable
     attr_reader :attributes # Anything that we initialize our table with. That's it. Can't be changed by state.
-    attr_reader :resource
+    attr_reader :effective_resource
     attr_reader :state
 
     # Hashes of DSL options
@@ -149,6 +149,14 @@ module Effective
       @dsl_tool ||= DatatableDslTool.new(self)
     end
 
+    def resource
+      @effective_resource
+    end
+
+    def fallback_effective_resource
+      @fallback_effective_resource ||= Effective::Resource.new('', namespace: controller_namespace)
+    end
+
     private
 
     def column_tool

data/app/models/effective/datatable_column_tool.rb

@@ -43,7 +43,7 @@ module Effective
       Rails.logger.info "COLUMN TOOL: order_column #{column.to_s} #{direction} #{sql_column}" if EffectiveDatatables.debug
 
       if column[:sql_as_column]
-        collection.order("#{sql_column} #{datatable.resource.sql_direction(direction)}")
+        collection.order("#{sql_column} #{datatable.effective_resource.sql_direction(direction)}")
       else
         Effective::Resource.new(collection)
           .order(column[:name], direction, as: column[:as], sort: column[:sort], sql_column: column[:sql_column], limit: datatable.limit)

data/app/models/effective/effective_datatable/resource.rb

@@ -13,9 +13,15 @@ module Effective
 
       private
 
+      def load_effective_resource!
+        @effective_resource = if active_record_collection?
+          Effective::Resource.new(collection_class, namespace: controller_namespace)
+        end
+      end
+
       # This looks at all the columns and figures out the as:
       def load_resource!
-        @resource = Effective::Resource.new(collection_class, namespace: controller_namespace)
+        load_effective_resource!
 
         if active_record_collection?
           columns.each do |name, opts|

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.6.1'.freeze
+  VERSION = '3.6.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.3
 platform: ruby
 authors:
 - Code and Effect