effective_datatables 4.25.3 → 4.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6795fc15046e40e435529576eb9f7f4c3473e51c12f0a62778854d567b8abee6
-  data.tar.gz: a1db0bc8b76f4f47561458dc7df631ed065cb5f5734840db664b493cb2012cbe
+  metadata.gz: e6af5d5e2542f1b4b587ad472f4be837fe81cf57cad38edf272986ba358710ae
+  data.tar.gz: ada5f3e65dd9c40eedf6acda70db0e5955dc0b693fb1604392a1fbd5e7e98bba
 SHA512:
-  metadata.gz: 16816ddfd74f48e8d6deb1ac9a2d05d665fc8c063e8865b7c7237df8cc5a1b70921472927a26d09f00e94fb65764ab3280373c857ffa7c9ebe8e6d33d9b18d54
-  data.tar.gz: 4b65d03eddc9bc7bf6040b069995b211747cabcfdf0ca5bff05c9337172cfd59926a7f7bcbbb3b92fb3bb27bab85775e0838a78799ff265020eb84397fe0449c
+  metadata.gz: 6833350b97bb37061602f756c291b7fb30af237b0895952f6ac41ac4e4b565e03d7ce1ab5503e1ef4adc2fca3574edb325b81d5d3a9818515be2b039f3d580f0
+  data.tar.gz: '0859ffbe2c11c23c58d2743d76bd99f23af3c67d28f3b888ab3ecd9f68e0a9b9c181b37ad7e93b406e7bde949c04566dd4b7d0bf7b1a183cb6fb0df7e13dbb22'

data/app/models/effective/datatable_column.rb

@@ -23,6 +23,10 @@ module Effective
       @attributes[:format] = block; self
     end
 
+    def format_each(&block)
+      @attributes[:format_each] = block; self
+    end
+
     def search(&block)
       @attributes[:search_method] = block; self
     end

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

@@ -134,7 +134,7 @@ module Effective
         when :effective_obfuscation
           value.to_s
         when :effective_roles
-          value.join(', ')
+          csv ? value.join(', ') : view.roles_badges(value)
         when :email
           csv ? value : view.mail_to(value)
         when :integer
@@ -224,6 +224,7 @@ module Effective
           resource_name: resource_name,
           resource_to_s: resource_to_s,
           effective_resource: associated_resource,
+          format_each: opts[:format_each],
           show_action: false,
           edit_action: false
         }

data/app/views/effective/datatables/_resource_column.html.haml

@@ -1,5 +1,7 @@
 - Array(local_assigns[:resource_name] ? resource.public_send(resource_name) : resource).each do |resource|
-  - resource_to_s = ((local_assigns[:resource_to_s] && resource) ? resource.public_send(resource_to_s) : resource.to_s)
+  - resource_to_s = (resource.public_send(resource_to_s) if local_assigns[:resource_to_s])
+  - resource_to_s ||= (instance_exec(resource, datatable, &format_each).html_safe if local_assigns[:format_each])
+  - resource_to_s ||= resource.to_s
 
   - if resource_to_s.present?
     .col-resource_item

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.25.3'.freeze
+  VERSION = '4.26.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.25.3
+  version: 4.26.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails