effective_datatables 3.4.8 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea612785cbdfbc0f2c43e4eebff0b59e2c9cee16
-  data.tar.gz: c036efb3cd28bb6562a3840cb49f53952e1bee6a
+  metadata.gz: 6c10e95994f32935efe7f8c67dec2aad4d29b4b1
+  data.tar.gz: 7fc0b0c12d2ec760b2c1ccb1dd50e207d6f822d3
 SHA512:
-  metadata.gz: f8cedc334ad98daeff7ba4758d746379f87e05c4330ba8b19ba49b533a77df214c8252e01cc7a61020c2d0b93fbbf13a795ed5fdac10052fe729022bd270ca4c
-  data.tar.gz: 6046a329e04cb59c6aefba7a7de03c94c905c8e79c06a4be2960e8710d928be36a4bbbd3de5cbe05f2af8455c594162e75703c8529f346ab5a94b058448c2d86
+  metadata.gz: eb07bce27774287278e118c8020c9a86637dc0a165bea79f562b1e8655af7a2958eb907738219dca608306e2339df3d073f40302941073ff3aef6ffef5c0eaaa
+  data.tar.gz: 31ca91bbd2d7d17156e120b9a06b2e285ff9acff6e461ffd2d34cc044909df32f057f36622ab662716240d61d041eef5bb586378c7900813f394540282773bb2

data/README.md

@@ -237,10 +237,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: :glyphicons) do
-        glyphicon_to('print', print_post_path(post), title: 'Print')
-      end
+    actions_col(edit: false) do |post|
+      glyphicon_to('print', print_post_path(post), title: 'Print')
     end
 
   end
@@ -516,45 +514,36 @@ 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
+actions_partial: :glyphicons
 ```
 
-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.
+Each object is checked individually for authorization.
 
-Use the block syntax to add additional actions
+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).
 
-```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')
-end
-```
+It's all very complicated.
 
-or
+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_form_inputs` gem.
 
 ```ruby
 actions_col do |post|
-  render_resource_actions(resource, post, edit: false, partial: :glyphicons) do
-    glyphicon_to('print', print_post_path(post), title: 'Print')
-  end
+  glyphicon_to('print', print_post_path(post), title: 'Print')
 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/helpers/effective_datatables_private_helper.rb

@@ -9,7 +9,7 @@ module EffectiveDatatablesPrivateHelper
     datatable.columns.map do |name, opts|
       {
         name: name,
-        title: content_tag(:span, opts[:label], class: 'search-label'),
+        title: content_tag(:span, (opts[:label] == false ? '' : opts[:label]), class: 'search-label'),
         className: opts[:col_class],
         searchHtml: (datatable_search_html(form, name, datatable.state[:search][name], opts) unless datatable.simple?),
         responsivePriority: opts[:responsive],

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

@@ -31,7 +31,7 @@ module Effective
             col_class: col_class,
             format: (format if block_given?),
             index: nil,
-            label: label || name.to_s.split('.').last.titleize,
+            label: (label.nil? ? name.to_s.split('.').last.titleize : label),
             name: name,
             partial: partial,
             partial_as: partial_as,
@@ -59,7 +59,7 @@ module Effective
             col_class: col_class,
             format: nil,
             index: nil,
-            label: label || name.to_s.split('.').last.titleize,
+            label: (label.nil? ? name.to_s.split('.').last.titleize : label),
             name: name,
             partial: partial,
             partial_as: partial_as,
@@ -83,7 +83,7 @@ module Effective
             col_class: col_class,
             format: nil,
             index: nil,
-            label: '',
+            label: false,
             name: :bulk_actions,
             partial: partial || '/effective/datatables/bulk_actions_column',
             partial_as: partial_as,
@@ -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(
@@ -107,10 +107,11 @@ module Effective
             col_class: col_class,
             format: (format if block_given?),
             index: nil,
-            label: '',
+            label: false,
             name: :actions,
             partial: partial,
             partial_as: partial_as,
+            actions_partial: (actions_partial || :glyphicons),
             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: :glyphicons }.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 = '3.4.8'.freeze
+  VERSION = '3.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.5.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
@@ -180,7 +180,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