effective_datatables 4.3.14 → 4.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2ec322b027d0c64af201b2f7356fbad6d2584e
-  data.tar.gz: 6f27b2d7b3c3c9424b1301c78a6b10aa91c0ef0f
+  metadata.gz: 7f1b5b329ca2354da5f168735977f3cb7d7aa575
+  data.tar.gz: 3e50ed652423c0ff92186bd9ba5069d5da8815fa
 SHA512:
-  metadata.gz: 650a1ad46b4a2384438877d17687cc807012f2de888cdb5834bf543f4e84a709884dbca4f9bc3459654411ac35f071cdb5b7506fbcd35594ab2cc3aa13458676
-  data.tar.gz: 1ce0b64574d75ed034999b741fcb229d81ff7a6412220ad381f051724e6c9eb741a5852e4f9cfe44ddc3fc07635472d741e9b1595bbeaa91b3c9d0887e34bd05
+  metadata.gz: d360e5c267b75b79a48833d53b0ccfd84b3c89ed44b887b7977fd1fc238488c5faa4ffeafd571bb6c85b5b0adba6491f67c6fa57829d0d23c4e431cb7af383c1
+  data.tar.gz: aae4e1ac2f63ee04a28c4824b735d9eac0ee9d5332c6e07087e87907b0b6cc498c36869d5ac84ce56f7debde2f6a6cfa6fd6d9eec8d152686d31778f267ef35a

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

@@ -36,7 +36,7 @@ module Effective
 
       def search_params
         params.select do |name, value|
-          columns.key?(name) && (name != :id) && !value.kind_of?(Hash) && value.class.name != 'ActionController::Parameters'.freeze
+          columns.key?(name) && ![:id, :action].include?(name) && !value.kind_of?(Hash) && value.class.name != 'ActionController::Parameters'.freeze
         end
       end
     end

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

@@ -1,8 +1,8 @@
 - Array(datatable.array_collection? ? resource : resource.send(name)).each do |resource|
   .col-resource_item
-    - if edit_action && EffectiveDatatables.authorized?(controller, :edit, resource)
-      = link_to resource.to_s, effective_resource.action_path(:edit, resource), title: resource.to_s
-    - elsif show_action && EffectiveDatatables.authorized?(controller, :show, resource)
-      = link_to resource.to_s, effective_resource.action_path(:show, resource), title: resource.to_s
+    - if edit_action && EffectiveDatatables.authorized?(controller, :edit, resource) && (path = effective_resource.action_path(:edit, resource)).present?
+      = link_to resource.to_s, path, title: resource.to_s
+    - elsif show_action && EffectiveDatatables.authorized?(controller, :show, resource) && (path = effective_resource.action_path(:show, resource)).present?
+      = link_to resource.to_s, path, title: resource.to_s
     - else
       = resource.to_s.html_safe

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.14'.freeze
+  VERSION = '4.3.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.14
+  version: 4.3.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails