caboose-cms 0.3.48 → 0.3.49
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.
- checksums.yaml +8 -8
- data/app/models/caboose/page_bar_generator.rb +22 -12
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MWZlMWQxZWMwYjBiMWI4NTFjMTA5ZGQ0NDZhYWFlY2JlZTVkMjA2OQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
OTVmYmI0Y2ZhZjNjNDZhZGY2ZmRlYmUyMTQyZTYzY2Y1YWE0MTY4NA==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YjQ1ZTJhMDcyZWMxZWRjMTk4N2E1M2YzMWNhZjA0MTZmYzZlYTM0Nzg1ZDMz
|
10
|
+
OWI2YTY3OGY4ZjNkYmRkOGQ3N2ZlY2JhODQ2NzFiNzYyYTE4ZDRlMWMzODE5
|
11
|
+
MThlZDg0MTAzMjdiMzVlOWM4MTExZjgyMWE1NzkzZTUyMjQ5YWY=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NjRmYTc5MTE1NzZlNTA5NThlNDcyNDQ4NDdmNDIzNjAzZDYwN2ZiZTZlNWRm
|
14
|
+
Njg4YzNmY2E1YzVjYWYzMDQ3OWExYjRlZTgzOWEzNGY4NGI4OGRmZDIzNzNl
|
15
|
+
MmE2YTE2ZGE5MmQ3YjkzM2VkMzQ0NzYzNjA2ZjgyYTg1YjgzYzg=
|
@@ -263,19 +263,29 @@ module Caboose
|
|
263
263
|
col = "#{table_name_of_association(arr[0])}.#{arr[1]}"
|
264
264
|
end
|
265
265
|
if k.include?('_concat_')
|
266
|
-
arr = k.split('_concat_')
|
267
|
-
col1 = arr[0]
|
268
|
-
col2 = arr[1]
|
266
|
+
#arr = k.split('_concat_')
|
267
|
+
#col1 = arr[0]
|
268
|
+
#col2 = arr[1]
|
269
|
+
#
|
270
|
+
#col2 = col2[0..-5] if col2.ends_with?('_gte')
|
271
|
+
#col2 = col2[0..-4] if col2.ends_with?('_gt')
|
272
|
+
#col2 = col2[0..-5] if col2.ends_with?('_lte')
|
273
|
+
#col2 = col2[0..-4] if col2.ends_with?('_lt')
|
274
|
+
#col2 = col2[0..-4] if col2.ends_with?('_bw')
|
275
|
+
#col2 = col2[0..-4] if col2.ends_with?('_ew')
|
276
|
+
#col2 = col2[0..-6] if col2.ends_with?('_like')
|
277
|
+
#
|
278
|
+
#col = "concat(#{col1},' ', #{col2})"
|
269
279
|
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
col = "concat(#{
|
280
|
+
arr = k.split('_concat_')
|
281
|
+
arr[arr.count-1] = arr[arr.count-1][0..-5] if k.ends_with?('_gte')
|
282
|
+
arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_gt')
|
283
|
+
arr[arr.count-1] = arr[arr.count-1][0..-5] if k.ends_with?('_lte')
|
284
|
+
arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_lt')
|
285
|
+
arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_bw')
|
286
|
+
arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_ew')
|
287
|
+
arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_like')
|
288
|
+
col = "concat(#{arr.join(",' ',")})"
|
279
289
|
end
|
280
290
|
|
281
291
|
sql2 = ""
|
data/lib/caboose/version.rb
CHANGED