effective_datatables 3.5.0 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c10e95994f32935efe7f8c67dec2aad4d29b4b1
-  data.tar.gz: 7fc0b0c12d2ec760b2c1ccb1dd50e207d6f822d3
+  metadata.gz: 9cd68beee734d563dfcd4ee9535e01aee6d121b3
+  data.tar.gz: 75255066db9a98a9da9d18534c402202670f84c1
 SHA512:
-  metadata.gz: eb07bce27774287278e118c8020c9a86637dc0a165bea79f562b1e8655af7a2958eb907738219dca608306e2339df3d073f40302941073ff3aef6ffef5c0eaaa
-  data.tar.gz: 31ca91bbd2d7d17156e120b9a06b2e285ff9acff6e461ffd2d34cc044909df32f057f36622ab662716240d61d041eef5bb586378c7900813f394540282773bb2
+  metadata.gz: ae954fd101983c833afc51e9ce27db3f92b904390ff26312b9bb4a791ea470bb49966f0a480c5111993ffea3999d897bf9f20b1fca67724c69ee5cc80e844339
+  data.tar.gz: 77de12778528a1d10fc9658d17e04cdacb74b6e16901df219f922a9522d579025c30fac329374272565499176131df3834e4832e71cd9e9b0fd3606641ef98a5

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

@@ -2,6 +2,7 @@ module Effective
   module EffectiveDatatable
     module Format
       BLANK = ''.freeze
+      NONVISIBLE = '...'.freeze
       SPACER = 'EFFECTIVEDATATABLESSPACER'.freeze
       SPACER_TEMPLATE = '/effective/datatables/spacer_template'.freeze
 
@@ -12,7 +13,9 @@ module Effective
         rendered = {}
 
         columns.each do |name, opts|
-          if opts[:partial] && state[:visible][name]
+          next unless state[:visible][name]
+
+          if opts[:partial]
             locals = { datatable: self, column: columns[name] }.merge(resource_col_locals(opts))
 
             rendered[name] = (view.render(
@@ -24,10 +27,9 @@ module Effective
               spacer_template: SPACER_TEMPLATE
             ) || '').split(SPACER)
           elsif opts[:as] == :actions # This is actions_col and actions_col do .. end, but not actions_col partial: 'something'
-            locals = { datatable: self, column: columns[name], spacer_template: SPACER_TEMPLATE }
-
             resources = collection.map { |row| row[opts[:index]] }
-            atts = opts[:actions].merge(effective_resource: resource, locals: locals, partial: opts[:actions_partial])
+            locals = { datatable: self, column: opts, spacer_template: SPACER_TEMPLATE }
+            atts = { actions: actions_col_actions(opts), effective_resource: resource, locals: locals, partial: opts[:actions_partial] }.merge(opts[:actions])
 
             rendered[name] = (view.render_resource_actions(resources, atts, &opts[:format]) || '').split(SPACER)
           end
@@ -36,13 +38,13 @@ module Effective
 
         collection.each_with_index do |row, row_index|
           columns.each do |name, opts|
-            next unless state[:visible][name]
-
             index = opts[:index]
             value = row[index]
 
             row[index] = (
-              if opts[:as] == :actions
+              if state[:visible][name] == false
+                NONVISIBLE
+              elsif opts[:as] == :actions
                 rendered[name][row_index]
               elsif opts[:format] && rendered.key?(name)
                 dsl_tool.instance_exec(value, row, rendered[name][row_index], &opts[:format])
@@ -67,7 +69,8 @@ module Effective
 
         case column[:as]
         when :actions
-          view.render_resource_actions(value, **column[:actions].merge(effective_resource: resource, partial: column[:actions_partial]))
+          atts = { actions: actions_col_actions(column), effective_resource: resource, partial: column[:actions_partial] }.merge(column[:actions])
+          (view.render_resource_actions(value, atts) || '')
         when :boolean
           case value
           when true   ; 'Yes'
@@ -110,6 +113,12 @@ module Effective
         end
       end
 
+      # Takes all default resource actions
+      # Applies data-remote to anything that's data-method post or delete
+      def actions_col_actions(column)
+        resource.resource_actions
+      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.5.0'.freeze
+  VERSION = '3.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord