effective_datatables 3.4.6 → 3.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0817076dc8c820589f2b05dd96ec11336d8030
-  data.tar.gz: df5e3e636888dcfba0564198af6c41a5362cae58
+  metadata.gz: e7a74b101dbbefc858af2be72ba90a7da1c1ae83
+  data.tar.gz: db20682940371ddaeaa38848e8f6d2ce5a2af923
 SHA512:
-  metadata.gz: 358b869727ff329401ded969fe6f850e7d72240fc66face9ae2418ad94979b00dacfc82bbc76cfd09a6365e680b979f1b1a77f0673ac72637b7170cf2e413423
-  data.tar.gz: 6128c9177de0251b1445f1b6ceee2a4ff656dc787cebf08a4c29badfe4251c85ea496e7bf09d40982bce22c2f38d6ca055cf88f33587f3af078780984c0a4134
+  metadata.gz: 05357fff6a2f3859cf8a5b54cc9f08edf4ee60528ad28ef37d147355d48bb14a77a740775356f2e76b9b30a795ffe7c76550007cc4a8c61102c80ccb3069e3bc
+  data.tar.gz: 27ce01e01f8c9f6e593215cd8e2136ba8168b9f0662281ecfc962974a087a127cb68005d1504179cc35279d4e51ba63dc95c1e97829b829d21fd92be7f192b5b

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

@@ -2,6 +2,8 @@ module Effective
   module EffectiveDatatable
     module Format
       BLANK = ''.freeze
+      SPACER = 'EFFECTIVEDATATABLESSPACER'.freeze
+      SPACER_TEMPLATE = '/effective/datatables/spacer_template'.freeze
 
       private
 
@@ -11,11 +13,7 @@ module Effective
 
         columns.each do |name, opts|
           if opts[:partial] && state[:visible][name]
-            locals = {
-              datatable: self,
-              column: columns[name],
-              controller_namespace: controller_namespace
-            }.merge(resource_col_locals(opts))
+            locals = { datatable: self, column: columns[name] }.merge(resource_col_locals(opts))
 
             rendered[name] = (view.render(
               partial: opts[:partial],
@@ -23,9 +21,18 @@ module Effective
               collection: collection.map { |row| row[opts[:index]] },
               formats: :html,
               locals: locals,
-              spacer_template: '/effective/datatables/spacer_template',
-            ) || '').split('EFFECTIVEDATATABLESSPACER')
+              spacer_template: SPACER_TEMPLATE
+            ) || '').split(SPACER)
+          elsif opts[:as] == :actions # This is default actions_col
+            locals = { datatable: self, column: columns[name], spacer_template: SPACER_TEMPLATE }
+
+            rendered[name] = (view.render_resource_actions(
+              resource,
+              collection.map { |row| row[opts[:index]] },
+              opts[:actions].merge(locals: locals)
+            ) || '').split(SPACER)
           end
+
         end
 
         collection.each_with_index do |row, row_index|
@@ -42,6 +49,8 @@ module Effective
                 dsl_tool.instance_exec(value, row, &opts[:format])
               elsif opts[:partial]
                 rendered[name][row_index]
+              elsif opts[:as] == :actions
+                rendered[name][row_index]
               else
                 format_column(value, opts)
               end
@@ -102,14 +111,6 @@ module Effective
         end
       end
 
-      def actions_col_locals(opts)
-        if opts[:as] == :actions
-          { actions_col_locals: opts[:actions].merge(effective_resource: resource) }
-        else
-          {}
-        end
-      end
-
       def resource_col_locals(opts)
         return {} unless (resource = opts[:resource]).present?
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.4.6'.freeze
+  VERSION = '3.4.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.4.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails