grape-listing 1.3.6 → 1.3.8

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
2
  SHA256:
3
- metadata.gz: ee9415ffe7fc63b1961a085af2e389bd80dfd1f73d47319c818400243dd7e30e
4
- data.tar.gz: 2d5f2ff2b20cadffd1d2d8e3193c143ec939834ec5da5040f8eb890f57995725
3
+ metadata.gz: 6ba8617bffac0ab4e4a01be9a04405601e47b623856460fac204877fc26317f7
4
+ data.tar.gz: aeca947deec2736192248fef996310e5848acd3575e176c9d708c5b6623d8799
5
5
  SHA512:
6
- metadata.gz: 76829ee7a764e674ca1ffb6bbfa1e1c8fb49a1b38c3e0bf5ff928e5adc674e3b20241f01f13ea5dbf8fccc8375d8b161714b4af7ee272593413f44f8da6c4b1c
7
- data.tar.gz: a6bfc21187b84366aa716d8a48e178c3c6be4a96a9bf13137510804395d2cf759bd329abb1e3595a7a6088c059113574c073b6bfafe68e35039f5fe2818a9243
6
+ metadata.gz: c4cf61f5dde0b861f2cbeb372c324a02eaf9a1b71dcb6ff573f48b427abf0a10c0e232dc1851414094d0e103ee4000950d6f1a8c97553b0e9c62d01d6ee3a972
7
+ data.tar.gz: cb98c65e16c43a058c1c513e223e6ff15b2a3b2a13acd538a29aba2167f232ebb363847123509efb54227ecf3abe8451bb43b6f7e34b808f676c5b7f83ca2c4d
@@ -20,7 +20,6 @@ module GrapeListing
20
20
  scope_name = operator.split('.')[1]
21
21
  # применение скоупа
22
22
  @objects = list.send(scope_name, value).distinct
23
- @objects_count = @objects.distinct.count
24
23
  next
25
24
  end
26
25
 
@@ -41,7 +40,10 @@ module GrapeListing
41
40
 
42
41
  query = where_query(table, field, operator, value)
43
42
  @objects = list.where(query)
44
- @objects_count = @objects.count
43
+ end
44
+
45
+ if @objects
46
+ @objects_count = @objects.distinct.count
45
47
  end
46
48
  end
47
49
 
@@ -55,7 +57,7 @@ module GrapeListing
55
57
  value = "%#{value}%" if operator == 'ilike' && value.present?
56
58
 
57
59
  # проверка мульти-поиска по параметру с массивом
58
- if value.is_a?(Array)
60
+ if value.is_a?(Array) && operator.exclude?('custom')
59
61
  operator = 'IN'
60
62
  value = "(#{value.map { |i| "'#{i}'" }.join(', ')})"
61
63
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: grape-listing
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.6
4
+ version: 1.3.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Павел Бабин
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-12-03 00:00:00.000000000 Z
11
+ date: 2024-12-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack