table_on_steroids 0.1.1.11 → 0.1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1378468bf399d1096d6d742f411713b663d79b17e8ce51acde40c1e17ca9083b
-  data.tar.gz: f5fa42544357f2ee09879351e98960b8c05d276bf8a372e3f0b66aa27c7d0be4
+  metadata.gz: 7465e38f859d0397ee8ad0eed777e2a2b661b2e0a3d4b7952f4ebb9d7c69a610
+  data.tar.gz: 5a8e76b9f9b291096e01f0cda446c10cb49cdbfc65ccd47ef1b5c490d815a039
 SHA512:
-  metadata.gz: 51fb1cedc9bc4d726094e024b7b51a4ce0ac91cb35103838a0e9a50cae1c6c2e4ab3c5f939f543e6a813edad82f218e6eb9e45700b50832a86a30eaa32d3335e
-  data.tar.gz: e44da86c8988df5c3385925aa35249a5a9509d438fb6d3ddd4734ab9b883e0347b11d18f132db541e25f28217732e6f57966cef8f67afdbd7e94852ee3d7f671
+  metadata.gz: 571dc4f5dbe9f349c43946354e45658e4e2958d972169fffbe0be804bbaeef5e1be8eda93541b82b0712e4cdc0ad82c927ba3c4327b51e3b01cda3ae8f0d2173
+  data.tar.gz: 5666920239c588d56c687a2f599d8a4db97e8ff17a47d597138f0b624d996005dc2844f1dbdbede19ca2d10063fb1e1e32b55ff4a6c20c595778465ec211cef2

data/app/controllers/concerns/table_on_steroids/table_concern.rb

@@ -50,18 +50,16 @@ module TableOnSteroids
         # column search
         objects = objects_where(objects, columns_on_steroid, t)
 
-        # apply filters
-        if params[:filters].present?
-          params[:filters].each_pair do |k, v|
-            filter = columns_on_steroid[k]
-            next unless filter.present? && filter[t].present?
-
-            objects = filter[t][:filter_lambda].call(objects, v)
+        filter_columns = columns_on_steroid.map{|k,v| k if v.dig(t,:filter_lambda) }.compact
+        filter_columns.each do |k|
+          filter_value = (params[:filters] && params[:filters][k]) || params[k]
+          if(!filter_value.blank?)
+            objects = columns_on_steroid[k][t][:filter_lambda].call(objects, filter_value)
           end
         end
 
         #order
-        if params&.dig(:knowledge,:order) && (object_order = columns_on_steroid[params[:knowledge][:order]]).present?       
+        if params&.dig(:knowledge,:order) && (object_order = columns_on_steroid[params[:knowledge][:order]]).present?
           if(object_order[t] && object_order[t][:order_lambda])
             direction = (params&.dig(:knowledge,:ascending).to_s == 'true') ? 'asc' : 'desc'
             objects = objects.reorder(nil) if(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))

data/lib/table_on_steroids/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableOnSteroids
-  VERSION = '0.1.1.11'
+  VERSION = '0.1.1.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_on_steroids
 version: !ruby/object:Gem::Version
-  version: 0.1.1.11
+  version: 0.1.1.12
 platform: ruby
 authors:
 - Marieke Gueye
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails