effective_datatables 4.0.6 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c0242dbad62480da69762b2a04510d3cb981c3
-  data.tar.gz: a2df8c30649013e402b8f4732865d762d1efafc8
+  metadata.gz: d69d595177621883ab3c5780638b85faa04d8f32
+  data.tar.gz: 7c9f57a71d65beabe49c5d8f4adc5f5362128eea
 SHA512:
-  metadata.gz: 905f3715cb5952943b5037138a1ee879d6e50e298dc11b6b29f4087d37f9a559797b787869fca2201109ccebe1d001a9bc0071729d0f4981a2c70ee468d5f335
-  data.tar.gz: 8dc776904f5ace7f5ec0b0fbc74b8576336803f36cb95c5f76cd7ece4d649902d1fd10bdcd468f0a28376c608246d0e138695bbd5c53410d6d3300f28d1f93ec
+  metadata.gz: 2d69c22547212f4fb751ddc18e4047555fe9c4a26837f713a000574f7f9f19511131b3f5308a4e29cac6d144759310b49cdb91f1e1f0b5bef2d79db6cbf634dd
+  data.tar.gz: f68c1fcfdd7182f2ec3ea825204f0e811aafde21a86a7bab3c3110ee84ff3ba86df8fcaf45d632af4e61a77f93c3924c1a40b26ff4cfb9d94eee92ce90ddc09c

data/README.md

@@ -235,11 +235,12 @@ class PostsDatatable < Effective::Datatable
     aggregate :total
 
     # Uses effective_resources gem to discover the resource path and authorization actions
-    # Puts in icons to show/edit/destroy actions, if authorized to those actions.
+    # Puts links to show/edit/destroy actions, if authorized to those actions.
     # Use the actions_col block to add additional actions
-    actions_col show: false do |post|
-      if !post.approved? && can?(:approve, Post)
-        link_to 'Approve', approve_post_path(post) data: { method: :post, confirm: 'Really approve?'}
+
+    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
     end
   end
@@ -515,35 +516,31 @@ You can only have one `bulk_actions_col` per datatable.
 
 ### actions_col
 
-When working with an ActiveRecord based collection, this column will consider the `current_user`'s authorization, and generate
-glyphicon links to edit, show and destroy actions for any collection class.
+When working with an ActiveRecord based collection, this column will consider the `current_user`'s authorization, and generate links to edit, show and destroy actions for any collection class.
 
 The authorization method is configured via the `config/initializers/effective_datatables.rb` initializer file.
 
 There are just a few options:
 
 ```ruby
-show: true|false|:authorize
-edit: true|false|:authorize
-destroy: true|false|:authorize
-
+show: true|false
+edit: true|false
+destroy: true|false
 visible: true|false
 ```
 
 When the show, edit and destroy actions are `true` (default), the permission check will be made just once, authorizing the class.
-When set to `:authorize`, permission to each individual object will be checked.
 
-Use the block syntax to add additional actions
+Use the block syntax to add additional actions. This helper comes from `effective_resources` gem.
 
 ```ruby
-actions_col show: false do |post|
-  (post.approved? ? link_to('Approve', approve_post_path(post)) : '') +
-  glyphicon_to('print', print_ticket_path(ticket), title: 'Print')
+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
 end
 ```
 
-The `glyphicon_to` helper is part of the [effective_resources](https://github.com/code-and-effect/effective_resources) gem, which is a dependency of this gem.
-
 ### length
 
 Sets the default number of rows per page. Valid lengths are `5`, `10`, `25`, `50`, `100`, `250`, `500`, `:all`

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

data/config/effective_datatables.rb

@@ -32,10 +32,9 @@ EffectiveDatatables.setup do |config|
   # Valid values for each action are:
   # true - display this action if authorized?(:show, Post)
   # false - do not display this action
-  # :authorize - display this action if authorized?(:show, Post<3>)  (every instance is checked)
   #
   # You can override these defaults on a per-table basis
-  # by calling `actions_column(show: false, edit: true, destroy: :authorize)`
+  # by calling `actions_column(show: false, edit: true, destroy: false)`
   config.actions_column = {
     show: true,
     edit: true,

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.0.6'.freeze
+  VERSION = '4.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.1.0
 platform: ruby
 authors:
 - Code and Effect