effective_datatables 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff455a937b6f6870cf7fa13018555eed202b443b
-  data.tar.gz: f562a3ed7baea7156ed3dac22c6746d8c5a03ed8
+  metadata.gz: eafac19670114b90cdf9feeccfcc14b3e18e402c
+  data.tar.gz: 3d5bb7ff5c3195dc153b331ea2ee5b19d9448497
 SHA512:
-  metadata.gz: 80d4d1f0bf4887f31fbd254826dc16adccd0723adbeaa892afe2a61b5aec951e9e07597c409daccc0e9159bc46e6deb1239687cda7ae0df1d4c0907ac9a4fa74
-  data.tar.gz: 262562debebf67107139eeae352a71f212082878ae4ef0972160ebb0e68dafa77e6c58346ccb5d7ae8fdc16c05842554675985058a95baf3bd9e813da026d92f
+  metadata.gz: 4af14c97a3e1189d23deb9d80f6fdde8d90234e14f7c4c8151de5904feba8c082ae54b7b888a99e38a905364368ee695ffaa183e948ef8eae7f33dd743a8f903
+  data.tar.gz: 61c2923c00252fdaeed3d7a26b4a97c0a829e99a3a0bb5eae182f29a26ea4a1a727334c3109aa5efeb274e6ce6b9eb5ba43d5e8b43b9b95f4eb70b4cdd8c01fd

data/README.md

@@ -238,10 +238,8 @@ class PostsDatatable < Effective::Datatable
     # Puts links to show/edit/destroy actions, if authorized to those actions.
     # Use the actions_col block to add additional actions
 
-    actions_col do |post|
-      render_resource_actions(resource, post, edit: false, partial: :dropleft) do
-        dropdown_link_to('Approve', approve_post_path(post) data: { method: :post, confirm: "Approve #{post}?"})
-      end
+    actions_col(edit: false) do |post|
+      dropdown_link_to('Approve', approve_post_path(post) data: { method: :post, confirm: "Approve #{post}?"})
     end
   end
 
@@ -527,17 +525,22 @@ show: true|false
 edit: true|false
 destroy: true|false
 visible: true|false
+actions_partial: :dropleft
 ```
 
-When the show, edit and destroy actions are `true` (default), the permission check will be made just once, authorizing the class.
+Each object is checked individually for authorization.
+
+The arguments to `actions_col` are passed through to the `effective_resource` gem's [render_resource_actions](https://github.com/code-and-effect/effective_resources/blob/master/app/helpers/effective_resources_helper.rb#L57).
+
+It's all very complicated.
 
-Use the block syntax to add additional actions. This helper comes from `effective_resources` gem.
+If you just want to override this entire column with your own actions implementation, you can pass `actions_col partial: 'my_partial'` and roll your own.
+
+Otherwise, use the following block syntax to add additional actions. This helper comes from `effective_bootstrap` gem.
 
 ```ruby
 actions_col do |post|
-  render_resource_actions(resource, post, edit: false, partial: :dropleft) do
-    dropdown_link_to('Approve', approve_post_path(post) data: { method: :post, confirm: "Approve #{post}?"})
-  end
+  dropdown_link_to('Approve', approve_post_path(post) data: { method: :post, confirm: "Approve #{post}?"})
 end
 ```
 

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

@@ -97,7 +97,7 @@ module Effective
           )
         end
 
-        def actions_col(show: nil, edit: nil, destroy: nil, col_class: nil, partial: nil, partial_as: nil, responsive: 5000, visible: true, &format)
+        def actions_col(col_class: nil, partial: nil, partial_as: nil, actions_partial: nil, responsive: 5000, visible: true, **actions, &format)
           raise 'You can only have one actions column' if datatable.columns[:_actions].present?
 
           datatable._columns[:_actions] = Effective::DatatableColumn.new(
@@ -111,6 +111,7 @@ module Effective
             name: :actions,
             partial: partial,
             partial_as: partial_as,
+            actions_partial: (actions_partial || :dropleft),
             responsive: responsive,
             search: false,
             sort: false,
@@ -119,7 +120,8 @@ module Effective
             th_append: nil,
             visible: visible,
 
-            actions: { show: show, edit: edit, destroy: destroy, partial: :dropleft }.reject { |k, v| v.nil? }
+            # { approve: false }. These args are passed to effective_resources render_resource_actions
+            actions: actions
           )
         end
 

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

@@ -23,14 +23,13 @@ module Effective
               locals: locals,
               spacer_template: SPACER_TEMPLATE
             ) || '').split(SPACER)
-          elsif opts[:as] == :actions # This is default actions_col
+          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 }
 
-            rendered[name] = (view.render_resource_actions(
-              resource,
-              collection.map { |row| row[opts[:index]] },
-              opts[:actions].merge(locals: locals)
-            ) || '').split(SPACER)
+            resources = collection.map { |row| row[opts[:index]] }
+            atts = opts[:actions].merge(effective_resource: resource, locals: locals, partial: opts[:actions_partial])
+
+            rendered[name] = (view.render_resource_actions(resources, atts, &opts[:format]) || '').split(SPACER)
           end
 
         end
@@ -43,14 +42,14 @@ module Effective
             value = row[index]
 
             row[index] = (
-              if opts[:format] && rendered.key?(name)
+              if 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])
               elsif opts[:format]
                 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
@@ -68,7 +67,7 @@ module Effective
 
         case column[:as]
         when :actions
-          view.render_resource_actions(resource, value, **column[:actions])
+          view.render_resource_actions(value, **column[:actions].merge(effective_resource: resource, partial: column[:actions_partial]))
         when :boolean
           case value
           when true   ; 'Yes'

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.1.1'.freeze
+  VERSION = '4.2.0'.freeze
 end

metadata

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