effective_datatables 4.3.24 → 4.3.25

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 837c6fb296619d4702ade84dabb37a83b5365857
4
- data.tar.gz: 98fb11c65c1ed5fcddf849fdc06cc0d43cabfce3
2
+ SHA256:
3
+ metadata.gz: a16ff3e0ee330dd92b468f13de2561ee3ea70c2ae260b7c2a63988e6a2cfbd1f
4
+ data.tar.gz: e0e7bc71df208562f262c661f9130d3e03f3dc77187f53c79d60ff7a7823ba57
5
5
  SHA512:
6
- metadata.gz: 946f4f80a506e7c8f6b5ab7445b8e274068cc5d10fcdb0fa5d475240976d19ed58aeae7996593e8af1686f59ad48685ae1c0293ff53ac9b6f6df199fb2077a26
7
- data.tar.gz: 33f482a18a73adf8901f57d87f50c6262abcd5981b755555990fb4f2e0f31f50e8e871daf62a9f2204b4ad0b168b1dc874786a3856e86ae65166d673f676661f
6
+ metadata.gz: 8c5949f6b3899844d2e6bbdd281e058f0ff689fe854380873b2b01c8af8b4429d7359d12c98ff99036a29050b05df528cd94584b65c96dcd5d9f82331c7ebe5a
7
+ data.tar.gz: '029add82b60a5d00e117ec70f0d2e51b6003224278c17c6b21781fcf5e9e3787627c319fdc05b3d249b12345fb2d3a1ce0f607838ecd6316c1dc4b87a92e8b12'
@@ -119,7 +119,7 @@ module Effective
119
119
  when Symbol
120
120
  opts[:search] = { as: opts[:search] }
121
121
  when Array, ActiveRecord::Relation
122
- opts[:search] = { collection: opts[:search] }
122
+ opts[:search] = { as: :select, collection: opts[:search] }
123
123
  when Hash
124
124
  # Nothing
125
125
  else
@@ -146,6 +146,8 @@ module Effective
146
146
 
147
147
  if array_collection? && opts[:resource].present?
148
148
  search.reverse_merge!(resource.search_form_field(name, collection.first[opts[:index]]))
149
+ elsif search[:as] == :select && search.key?(:collection)
150
+ # No Action
149
151
  elsif search[:as] != :string
150
152
  search.reverse_merge!(resource.search_form_field(name, opts[:as]))
151
153
  end
@@ -1,3 +1,3 @@
1
1
  module EffectiveDatatables
2
- VERSION = '4.3.24'.freeze
2
+ VERSION = '4.3.25'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_datatables
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.3.24
4
+ version: 4.3.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-06 00:00:00.000000000 Z
11
+ date: 2019-03-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
187
187
  version: '0'
188
188
  requirements: []
189
189
  rubyforge_project:
190
- rubygems_version: 2.4.5.1
190
+ rubygems_version: 2.7.3
191
191
  signing_key:
192
192
  specification_version: 4
193
193
  summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord