effective_datatables 4.25.3 → 4.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6795fc15046e40e435529576eb9f7f4c3473e51c12f0a62778854d567b8abee6
-  data.tar.gz: a1db0bc8b76f4f47561458dc7df631ed065cb5f5734840db664b493cb2012cbe
+  metadata.gz: f6fd6b02564f438e0aa52250f202db9db27c5388e677b3e8758eecaa0a46ea82
+  data.tar.gz: b8fac9e5fbef111411e4b260e9d5ad4a2990cd7e5a8fbbda355b3baa1a2b4abc
 SHA512:
-  metadata.gz: 16816ddfd74f48e8d6deb1ac9a2d05d665fc8c063e8865b7c7237df8cc5a1b70921472927a26d09f00e94fb65764ab3280373c857ffa7c9ebe8e6d33d9b18d54
-  data.tar.gz: 4b65d03eddc9bc7bf6040b069995b211747cabcfdf0ca5bff05c9337172cfd59926a7f7bcbbb3b92fb3bb27bab85775e0838a78799ff265020eb84397fe0449c
+  metadata.gz: c7b229e901f10e15b6a1991b68ef50d69575082657257095e811492a1efc830f05732e0747ea86087b57ee80cf0204bc5745e72d3eff7c4fedb654159a170d61
+  data.tar.gz: fd3f4b8d1f6ad92d25b27bf220addec9754efa774bd941e23e6c1c6201533d6758f275403ff1b4f532eac5967c965fecf02e6d7f5313e9dbcfcbf0fd5d8e5292

data/app/assets/stylesheets/effective_datatables/_overrides.bootstrap4.scss

@@ -170,6 +170,11 @@ table.dataTable > thead {
   }
 }
 
+// Filters
+.effective-datatables-filter { 
+  p { margin-bottom: 0; }
+}
+
 // Processing div
 div.dataTables_wrapper div.dataTables_processing {
   margin: -26px 25% 0px 25%;

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/_filter_date_range.html.haml

@@ -33,15 +33,15 @@
 
 = f.show_if :date_range, :year do
   = f.static_field :year, wrapper: { class: 'effective-datatables-filter' } do
-    - date = f.object.start_date.beginning_of_year
+    - date = start_date.beginning_of_year
 
     = link_to '#', 'data-effective-datatables-filter-prev-year': date.advance(years: -1).strftime('%F') do
       = icon('arrow-left-circle')
       %span.prev-year= date.advance(years: -1).strftime('%Y')
 
-    %span.start-date= f.object.start_date.strftime('%F')
+    %span.start-date= start_date.strftime('%F')
     to
-    %span.end-date= f.object.end_date.strftime('%F')
+    %span.end-date= end_date.strftime('%F')
 
     = link_to '#', 'data-effective-datatables-filter-next-year': date.advance(years: 1).strftime('%F') do
       = icon('arrow-right-circle')
@@ -53,15 +53,15 @@
 
 = f.show_if :date_range, :month do
   = f.static_field :month, wrapper: { class: 'effective-datatables-filter' } do
-    - date = f.object.start_date.beginning_of_month
+    - date = start_date.beginning_of_month
 
     = link_to '#', 'data-effective-datatables-filter-prev-month': date.advance(months: -1).strftime('%F') do
       = icon('arrow-left-circle')
       %span.prev-month= date.advance(months: -1).strftime('%b')
 
-    %span.start-date= f.object.start_date.strftime('%F')
+    %span.start-date= start_date.strftime('%F')
     to
-    %span.end-date= f.object.end_date.strftime('%F')
+    %span.end-date= end_date.strftime('%F')
 
     = link_to '#', 'data-effective-datatables-filter-next-month': date.advance(months: 1).strftime('%F') do
       = icon('arrow-right-circle')

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.1'.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.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails