effective_datatables 4.8.3 → 4.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ebc0017738a2fc14868698d1ea0bc18e96c30b796abfc1c2b13e56a08e0af7
-  data.tar.gz: d3207a967e3ef7864da7865af6c9c349cc414a9a4d137437798c21971bc9dfe5
+  metadata.gz: 53f857de2d8388bada0837e3eca598ab75e45cba907bde7b43c01a13c2037cb1
+  data.tar.gz: '0488a5bf9fafd8a54833615f6d7610d22567d97c5e1b0d13cd2476e24706d08b'
 SHA512:
-  metadata.gz: cedbeff6abe599502b345b034cb8c62aa27c404b72d27baa1d0648273b73731bcfba68437854458bc69e986eadf6936407513275234c594ffc3c6c0619c23860
-  data.tar.gz: '04650818c9871e4ba2e00ff07d919b9b81c25b867e6033626d6b41004cf7e51fc8943751ca0c8762d83040473127a92672906e6217a677fced997f024ff6510e'
+  metadata.gz: 740d034417e5aa04860b12a308f4e495b3856c4b86a67443f6ec2e18900a55be58c6edb7235d8ef66981bb827f05ecab29d3f691765b5dee43f5312804644adf
+  data.tar.gz: 91712a50aff213013867fd46bbdedc717e0c95fef1748d2d9076bfdd5930ce14a3fff1d158f0feed409c8431fb16b317fae1c34b21accd855546dc089c9dbb0d

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

@@ -4,7 +4,7 @@ module Effective
       AGGREGATE_SQL_FUNCTIONS = ['ARRAY_AGG(', 'AVG(', 'COUNT(', 'MAX(', 'MIN(', 'STRING_AGG(', 'SUM(']
 
       def admin_namespace?
-        controller_namespace == 'admin'
+        [:admin, 'admin'].include?(controller_namespace)
       end
 
       def controller_namespace
@@ -200,6 +200,7 @@ module Effective
 
       def load_resource_belongs_tos!
         return unless active_record_collection?
+        return unless @_collection_apply_belongs_to 
 
         changed = attributes.select do |attribute, value|
           attribute = attribute.to_s
@@ -210,7 +211,7 @@ module Effective
           next unless columns[associated]
 
           if columns[associated][:as] == :belongs_to
-            if @_collection_apply_belongs_to && !@_collection.where_values_hash.include?(attribute)
+            unless @_collection.where_values_hash.include?(attribute)
               @_collection = @_collection.where(attribute => value)
             end
 
@@ -218,10 +219,8 @@ module Effective
           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")
 
-            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
+            unless @_collection.where_values_hash.include?(attribute) || @_collection.where_values_hash.include?("#{associated}_type")
+              @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
             end
 
             columns.delete(associated)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.8.3'.freeze
+  VERSION = '4.8.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.8.3
+  version: 4.8.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails