five-two-nw-olivander 0.1.2.10 → 0.1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27eeceb116bacdfc914171167f209c9b09305a164e271ad5894fbc1ad78e0e1e
-  data.tar.gz: 4ef6d96a61a6ff296259441091813d1e7b9f513e11d47d2dd1cde96cc4faa4be
+  metadata.gz: 95371b71e1db9de5a935b1ecf9834a1b802a5a71c8960bd876a0c6e22ed849e5
+  data.tar.gz: f336a7acda0c1918f4a4a7d0dfdd672e4bdf6d68464172046b49539a27b573ef
 SHA512:
-  metadata.gz: ed49ba1c5d32c9ab8ef88bfdad416342cf80dd0eda3a0e1600db2e0c38bc5f97c6bdb8a929270ffa2d79768589719ba337a1f761e4cda5af64c939dfc0f24c75
-  data.tar.gz: f6717a1d889709cdb655d5b848e8a84aa7c1cfa62ecb112ce159835980ced10ecd332d8413a627af642207a8ef69059ad206ed3271c0e025f7779223af21db3f
+  metadata.gz: 6eaa2e44f71c887a9879f76a8516c509b27579ae6e5597fcccdca9f92947ef6ecf14b18a0386e19f6cb04732c7ad05b19b5d1f65464937e56deb7b3037f42967
+  data.tar.gz: a5123ae21498c52619c763866f930b40465efb1387010a71d92abdb7dea67d7664725f530d4d46e4adb6b86fd9ae0342a0f996a64bfcbcbd1612c8479105707b

data/app/datatables/olivander/datatable.rb

@@ -15,22 +15,28 @@ module Olivander
       end
     end
 
-    def self.auto_datatable(klazz, link_path: nil, only: [])
+    def self.auto_datatable(klazz, link_path: nil, only: [], except: [], hide: [], show: [])
+      Rails.logger.debug "initializing datatable for #{klazz}"
+
+      attributes = klazz.new.attributes.collect{ |x| x[0] }
+      attributes &&= only if only.size.positive?
+      attributes -= except if except.size.positive?
+
+      default_hidden = %w[id created updated created_at updated_at deleted_at current_user current_action]
+
       collection do
         klazz.all
       end
 
       datatable do
         bulk_actions_col
-        klazz.new.attributes.each do |att|
-          key = att[0]
-          next if only.size.positive? && !only.include?(key)
+        attributes.each do |key|
           sym = key.gsub('_id', '').to_sym
-          visible = !['created', 'updated', 'created_at', 'updated_at', 'deleted_at', 'current_user', 'current_action'].include?(key)
+          visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
           if link_path.present? && sym == :id
             link_col sym, link_path, :id
           elsif link_path.present? && sym == :name
-            link_col sym, link_path, [:id, :name]
+            link_col sym, link_path, %i[id name]
           else
             col sym, visible: visible
           end

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.10"
+  VERSION = "0.1.2.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.10
+  version: 0.1.2.12
 platform: ruby
 authors:
 - Eric Dennis