effective_datatables 4.7.2 → 4.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77051de30c4631f232f97e3124e475f7a6e5e0bd3570751184bda6602aa2ed48
-  data.tar.gz: b2e28b7d4705f55bfd992d66fe9743c49f8c25741df298decd508f85f07ae7ca
+  metadata.gz: 4680722774df8a353220ea8430222cda0502291a23ac39c5ffb70b3f36c524bb
+  data.tar.gz: a68b88bb5b0d0bf60c175be105dc4483c3962fb40e0796eadf6c02d598789b60
 SHA512:
-  metadata.gz: 0f7a190178e950221de01658a0030b428aeec82e539858fde8dca2f9e0e2db7781a8d8938bfcc464efd6626e6425c9e80968165a86afec582042ecf6b16d2aae
-  data.tar.gz: bec0582aa79e41a0e73e04fe8b50910f7e1b007daf9a39b2a2cdbbb54a80247baabd313cf9e9c2ed2b6b0a3eb1dc6f0a92d48f49110433f630709c0a7f529496
+  metadata.gz: 0a9e0d639eb8d8407d6b7113714d90e408f9b41b32fb8841695cc61532559a5ddff0ccbaaa0032bba21bf70fe59bc774ca34e3917a1165b042bddf3f1aab7a76
+  data.tar.gz: e30c2c0bd9a14faef5569aa2c996d6159c89ff973868351b7e1182efdcf04eb1fee0f9537c4531a5894410e11b9ad8d3c4ca579bfd30161afffdb0716d198de6

data/README.md

@@ -466,7 +466,7 @@ It accepts one optional block used to format the value after any search or sorti
 The following options are available:
 
 ```ruby
-action: :show|:edit|false  # :resource and relation columns only. generate links to this action. edit -> show by default
+action: :show|:edit|false  # Render as a link to this action. edit -> show by default
 as: :string|:integer|etc   # Sets the type of column initializing defaults for search, sort and format
 col_class: 'col-green'     # Sets the html class to use on this column's td and th
 label: 'My label'          # The label for this column

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

@@ -34,7 +34,7 @@ module Effective
           name = name.to_sym unless name.to_s.include?('.')
 
           datatable._columns[name] = Effective::DatatableColumn.new(
-            action: action,  # resource columns only
+            action: action,
             as: as,
             compute: nil,
             col_class: col_class,
@@ -62,7 +62,7 @@ module Effective
           name = name.to_sym unless name.to_s.include?('.')
 
           datatable._columns[name] = Effective::DatatableColumn.new(
-            action: action, # Resource columns only
+            action: action,
             as: as,
             compute: (compute if block_given?),
             col_class: col_class,

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

@@ -143,8 +143,12 @@ module Effective
         return {} unless (resource = opts[:resource]).present?
 
         polymorphic = (opts[:as] == :belongs_to_polymorphic)
+        associated = resource.macros.include?(opts[:as])
 
-        locals = { name: opts[:name], effective_resource: resource, show_action: false, edit_action: false }
+        resource_name = opts[:name] if associated 
+        resource_to_s = opts[:name] unless associated || array_collection?
+
+        locals = { resource_name: resource_name, resource_to_s: resource_to_s, effective_resource: resource, show_action: false, edit_action: false }
 
         case opts[:action]
         when :edit

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

@@ -102,6 +102,10 @@ module Effective
           opts[:as] ||= :string
           opts[:as] = :email if (opts[:as] == :string && name.to_s.end_with?('email'))
 
+          if opts[:action]
+            opts[:resource] ||= resource
+          end
+
           if opts[:resource] && !opts[:resource_field] && opts[:as] != :effective_addresses
             opts[:partial] ||= '/effective/datatables/resource_column'
           end

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

@@ -1,8 +1,10 @@
-- Array(datatable.array_collection? ? resource : resource.send(name)).each do |resource|
+- Array(local_assigns[:resource_name] ? resource.public_send(resource_name) : resource).each do |resource|
+  - resource_to_s = (local_assigns[:resource_to_s] ? resource.public_send(resource_to_s) : resource.to_s)
+
   .col-resource_item
     - if edit_action && EffectiveDatatables.authorized?(controller, :edit, resource) && (path = effective_resource.action_path(:edit, resource)).present?
-      = link_to resource.to_s, path, title: resource.to_s
+      = link_to resource_to_s, path, title: resource_to_s
     - elsif show_action && EffectiveDatatables.authorized?(controller, :show, resource) && (path = effective_resource.action_path(:show, resource)).present?
-      = link_to resource.to_s, path, title: resource.to_s
+      = link_to resource_to_s, path, title: resource_to_s
     - else
-      = resource.to_s.html_safe
+      = resource_to_s.html_safe

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.2'.freeze
+  VERSION = '4.7.3'.freeze
 end

metadata

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