effective_datatables 4.7.4 → 4.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a60c15f1f3a43328d70962644780fb14cae4d00ad3477ae66d343927458ab659
-  data.tar.gz: bcbce544e403042f50884b150c60eff9f259e10aaf303bc6c8397f066fadbfb1
+  metadata.gz: 48cac2f10a4ebc72966c0dfffbb2cfa813743d2bcc37ca2571e86252241d66ec
+  data.tar.gz: d7baf2ef61b1008ee0265c65bb3acb878c8da0d4031ea12cb4a27b000f54ef08
 SHA512:
-  metadata.gz: cd33fcd4b81119097378e889a07db9e487bca7dcf602591b8754dc10b42607e957854e8890c51461899b88d50a02f009fb158315d2aa0cbeeff5a5f5cbfe5484
-  data.tar.gz: e1e7394cf58aa0c2f9c09aaa8f5dd6f5031736cc7e921ea061af394686e93f8646298e516c522760d99856e18663723519aa6948b03422f114c282042ebc46fb
+  metadata.gz: 77eeca0bd8b7908e0fa6a893cb4cd96ab84c16bd235f520829c862104540861381af977ea017fd926608ea06620f43e935fd7af53a565321a7e00f52b66db54b
+  data.tar.gz: 42d1909524c35fc87fdd8495c5c28b84f93f8259b008a66d0a1037d1fc13f30e2efe86776f5fb5a35b2985b2bc32febdf14347e84abf9deed186810c19c16ea5

data/app/models/effective/datatable.rb

@@ -15,6 +15,8 @@ module Effective
 
     # The collection itself. Only evaluated once.
     attr_accessor :_collection
+    attr_accessor :_collection_apply_belongs_to
+    attr_accessor :_collection_apply_scope
 
     # The view
     attr_reader :view

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

@@ -14,7 +14,7 @@ module Effective
         @total_records = (active_record_collection? ? column_tool.size(col) : value_tool.size(col))
 
         # Apply scope
-        col = column_tool.scope(col)
+        col = column_tool.scope(col) if @_collection_apply_scope
 
         # Apply column searching
         col = column_tool.search(col)

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

@@ -10,8 +10,13 @@ module Effective
         define_method('initialize_charts') { dsl_tool.instance_exec(&block) }
       end
 
-      def collection(&block)
-        define_method('initialize_collection') { self._collection = dsl_tool.instance_exec(&block) }
+      def collection(apply_belongs_to: true, apply_scope: true, &block)
+        define_method('initialize_collection') { 
+          self._collection_apply_belongs_to = apply_belongs_to
+          self._collection_apply_scope = apply_scope
+          
+          self._collection = dsl_tool.instance_exec(&block) 
+        }
       end
 
       def datatable(&block)

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

@@ -180,12 +180,20 @@ module Effective
           next unless columns[associated]
 
           if columns[associated][:as] == :belongs_to
-            @_collection = @_collection.where(attribute => value)
+            if @_collection_apply_belongs_to && !@_collection.where_values_hash.include?(attribute)
+              @_collection = @_collection.where(attribute => value) 
+            end
+
             columns.delete(associated)
           elsif columns[associated][:as] == :belongs_to_polymorphic
             associated_type = attributes["#{associated}_type".to_sym] || raise("Expected #{associated}_type attribute to be present when #{associated}_id is present on a polymorphic belongs to")
 
-            @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
+            if @_collection_apply_belongs_to 
+              if !@_collection.where_values_hash.include?(attribute) && !@_collection.where_values_hash.include?("#{associated}_type")
+                @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
+              end
+            end
+            
             columns.delete(associated)
           end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.4'.freeze
+  VERSION = '4.7.5'.freeze
 end

metadata

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