effective_datatables 4.22.1 → 4.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c79cf839ae66513e19a6521dd43586efced5f1f2a7d95d3f853d7f08c4bce5f8
-  data.tar.gz: 7d9217845bdc45f36e57e40de87edd865d73427bd176d78756a970323dcf0d9f
+  metadata.gz: 59a32fa9af3a17a46a2f0ba0149dc47a1d6b58301b36a8ee73824552867b1b38
+  data.tar.gz: e0f6bfaf0037d47b7be43d8ca71f47cf72ca3c547c61a8cf65b1cf4e3fcc8fb2
 SHA512:
-  metadata.gz: 011e8f479efbec14d3fc4471b8f41a4292e583fd25969488c1112c0bbcde8d8dfc07a015aa693c18623078114471810c7801f84bbe17821062f53258a8b5e735
-  data.tar.gz: 16270f26ff15ce9264edf9669cc8c75e1550dc4d1c092cce1960d0bab828072e7722bb671c014b3c82cbf4fa0d035aaae3e34b945a5948808c160376d7e85c8e
+  metadata.gz: 1397ea1f8d7941a37cfe0da34a53b0f23843ec72d4200314ac496a9446306f077267a4c261eba9de14b00f6c0943238175613101c5d6c11053fefcd7fba88fc6
+  data.tar.gz: 5590659c494da1e65936d9ed42eb4f95d56a57e079e2ead6a9b9cb210b8ba9feba4952c21ac56c54bab4b6820b013b30077df79276fc468b71a177d0d75193e3

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

@@ -12,11 +12,6 @@ module Effective
         end
       end
 
-      def load_attributes!
-        return unless view.respond_to?(:controller_path)
-        @attributes[:namespace] ||= view.controller_path.split('/')[0...-1].join('/')
-      end
-
       # Polymorphic shorthand attributes.
       # If you pass resource: User(1), it sets resource_id: 1, resource_type: 'User'
       def initial_attributes(attributes)
@@ -35,6 +30,29 @@ module Effective
         retval
       end
 
+      def load_attributes!
+        return unless view.respond_to?(:controller_path)
+
+        # Assign namespace based off controller path unless given
+        @attributes[:namespace] ||= view.controller_path.split('/')[0...-1].join('/')
+
+        # If there are attributes[:user_type] and attributes[:user_id] type attributes load them into attributes[:user]
+        resource_attributes = @attributes.select do |key, value|
+          name = key.to_s
+          base = name.sub('_type', '')
+
+          name.ends_with?('_type') && @attributes.key?("#{base}_id".to_sym) && value.safe_constantize.present?
+        end
+
+        resource_attributes.each do |key, value|
+          name = key.to_s
+          base = name.sub('_type', '')
+
+          klass = value.constantize
+          @attributes[base.to_sym] ||= klass.find_by_id(attributes["#{base}_id".to_sym])
+        end
+      end
+
     end
   end
 end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.22.1'.freeze
+  VERSION = '4.22.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.22.1
+  version: 4.22.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails