effective_datatables 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5055d945bd4b6b8226f2841e55b02485199622b
-  data.tar.gz: 4c4f45643a7eb2918c5347c0961303fd6e53ec86
+  metadata.gz: 0c6e56a24c68555820e8fd71b7db4717a01447c7
+  data.tar.gz: 47a3d46c4ceeab5eac8612d37a077ee0aba09082
 SHA512:
-  metadata.gz: bfbfcd41cce3993fde4ccf3898a2cfd48d5651b7a6322a4aa6f96443c4fe03555a94b58274653b9d8a5a31aa535b9ae7ba21bf8bdd32338f6e4e3d251320c948
-  data.tar.gz: a7c027feb2545b7aed6363f7490eafc57291fa7804394e42ccdc589a0c1229f1788a3428a8ddf2102b9d519c257055ab425cbabeaaae6d12cb6648f78360d0a4
+  metadata.gz: b2b1e22237b8cdbff14edb359266f3079af6bfb52b072d590072ffa26382187b25d1f2306314d8e8e84826cb448190c31dde3d1837275f4b9f6a374795056987
+  data.tar.gz: 8a4624ec83c4752f1a29141af17a61f6392c7425eed955753fd028c4afe50271ea00192fb1ea1a3bc296eedecad58d1a334583d74d0e04460972cbb4ebe1757b

data/README.md

@@ -434,6 +434,16 @@ Override the default actions by passing your own partial:
 actions_column partial: 'admin/posts/actions'
 ```
 
+or just extend the default by
+
+```ruby
+actions_column do |post|
+  unless post.approved?
+    glyphicon_to('ok', approve_post_path(post), title: 'Approve')
+  end
+end
+```
+
 ### Showing action buttons
 
 The show/edit/destroy action buttons can be configured to always show, always hide, or to consider the current_user's permission level.

data/app/models/effective/datatable.rb

@@ -125,11 +125,11 @@ module Effective
     end
 
     def present?
-      total_records > 0
+      total_records > 0 || current_scope.present?
     end
 
     def empty?
-      total_records == 0
+      total_records == 0 && current_scope.blank?
     end
 
     def total_records

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

@@ -40,13 +40,14 @@ module Effective
             sortable: false,
             filter: false,
             responsivePriority: 0,
-            partial_locals: { show_action: show, edit_action: edit, destroy_action: destroy, unarchive_action: unarchive }
+            partial_locals: { show_action: show, edit_action: edit, destroy_action: destroy, unarchive_action: unarchive },
+            actions_block: block
           }.merge(options)
 
           opts[:partial_local] ||= :resource unless opts[:partial].present?
           opts[:partial] ||= '/effective/datatables/actions_column' unless proc.present?
 
-          table_column(name, opts, proc, &block)
+          table_column(name, opts, proc)
         end
 
         def bulk_actions_column(options = {}, proc = nil, &block)

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

@@ -29,9 +29,7 @@ module Effective
 
       def _initialize_attributes(args)
         args.compact.each do |arg|
-          if arg.respond_to?(:permit) # ActionController::Parameters / Rails 5
-            arg = arg.permit(*permitted_params).to_h()  # We permit only the scopes params
-          end
+          arg = arg.to_unsafe_h if arg.respond_to?(:permit) # ActionController::Parameters / Rails 5 hack. TODO.
 
           raise "#{self.class.name}.new() can only be initialized with a Hash like arguments" unless arg.kind_of?(Hash)
 

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

@@ -71,7 +71,10 @@ module Effective
 
             locals.merge!(opts[:partial_locals]) if opts[:partial_locals]
 
-            add_actions_column_locals(locals) if opts[:type] == :actions
+            if opts[:type] == :actions
+              add_actions_column_locals(locals)
+              locals[:actions_block] = opts[:actions_block]
+            end
 
             rendered[name] = (render(
               :partial => opts[:partial],

data/app/views/effective/datatables/_actions_column.html.haml

@@ -38,3 +38,7 @@
 - if unarchive_action && unarchive_path
   - if resource.respond_to?(:archived?) && resource.archived?
     = unarchive_icon_to unarchive_path.gsub(':to_param', resource.to_param)
+
+- if actions_block
+  = capture do
+    - instance_exec(resource, &actions_block)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.11.0'.freeze
+  VERSION = '2.11.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails