table_on_steroids 0.1.1.11 → 0.1.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/concerns/table_on_steroids/table_concern.rb +6 -8
  3. data/lib/table_on_steroids/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1378468bf399d1096d6d742f411713b663d79b17e8ce51acde40c1e17ca9083b
4
- data.tar.gz: f5fa42544357f2ee09879351e98960b8c05d276bf8a372e3f0b66aa27c7d0be4
3
+ metadata.gz: 7465e38f859d0397ee8ad0eed777e2a2b661b2e0a3d4b7952f4ebb9d7c69a610
4
+ data.tar.gz: 5a8e76b9f9b291096e01f0cda446c10cb49cdbfc65ccd47ef1b5c490d815a039
5
5
  SHA512:
6
- metadata.gz: 51fb1cedc9bc4d726094e024b7b51a4ce0ac91cb35103838a0e9a50cae1c6c2e4ab3c5f939f543e6a813edad82f218e6eb9e45700b50832a86a30eaa32d3335e
7
- data.tar.gz: e44da86c8988df5c3385925aa35249a5a9509d438fb6d3ddd4734ab9b883e0347b11d18f132db541e25f28217732e6f57966cef8f67afdbd7e94852ee3d7f671
6
+ metadata.gz: 571dc4f5dbe9f349c43946354e45658e4e2958d972169fffbe0be804bbaeef5e1be8eda93541b82b0712e4cdc0ad82c927ba3c4327b51e3b01cda3ae8f0d2173
7
+ data.tar.gz: 5666920239c588d56c687a2f599d8a4db97e8ff17a47d597138f0b624d996005dc2844f1dbdbede19ca2d10063fb1e1e32b55ff4a6c20c595778465ec211cef2
data/app/controllers/concerns/table_on_steroids/table_concern.rb CHANGED
@@ -50,18 +50,16 @@ module TableOnSteroids
50
50
  # column search
51
51
  objects = objects_where(objects, columns_on_steroid, t)
52
52
 
53
- # apply filters
54
- if params[:filters].present?
55
- params[:filters].each_pair do |k, v|
56
- filter = columns_on_steroid[k]
57
- next unless filter.present? && filter[t].present?
58
-
59
- objects = filter[t][:filter_lambda].call(objects, v)
53
+ filter_columns = columns_on_steroid.map{|k,v| k if v.dig(t,:filter_lambda) }.compact
54
+ filter_columns.each do |k|
55
+ filter_value = (params[:filters] && params[:filters][k]) || params[k]
56
+ if(!filter_value.blank?)
57
+ objects = columns_on_steroid[k][t][:filter_lambda].call(objects, filter_value)
60
58
  end
61
59
  end
62
60
 
63
61
  #order
64
- if params&.dig(:knowledge,:order) && (object_order = columns_on_steroid[params[:knowledge][:order]]).present?
62
+ if params&.dig(:knowledge,:order) && (object_order = columns_on_steroid[params[:knowledge][:order]]).present?
65
63
  if(object_order[t] && object_order[t][:order_lambda])
66
64
  direction = (params&.dig(:knowledge,:ascending).to_s == 'true') ? 'asc' : 'desc'
67
65
  objects = objects.reorder(nil) if(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))
data/lib/table_on_steroids/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module TableOnSteroids
4
- VERSION = '0.1.1.11'
4
+ VERSION = '0.1.1.12'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: table_on_steroids
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1.11
4
+ version: 0.1.1.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marieke Gueye
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2019-11-09 00:00:00.000000000 Z
12
+ date: 2020-02-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bootstrap-datepicker-rails