caboose-cms 0.3.61 → 0.3.62
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 +10 -14
- 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
|
+
NDFlM2FmNzJlZDJmN2MxZDdmMjM1NWVjMjdlYmRhYzRhZDNkY2I4ZA==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
MmQ2MTc1YjRlMzZmMzQ5NzIxYTY3YjhiNTQ5YjI3ZGVjMzA1Yzk3Mg==
|
|
7
7
|
!binary "U0hBNTEy":
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
NjQ3NjgwMDlhMmNlZDM4MWRlZDEzNWM0ZmJiMzRkZjExNDMwMTE1NjNiMjhk
|
|
10
|
+
NTVmYzdjNTdlNDExZWEzY2QzZDc5MjU0YzdhMzhmY2FmYjU2N2YzYjhiNjU1
|
|
11
|
+
MmM5NTU3ZTNlZjNjNDA2NGViMGVhZjU1ZjNjNDFjMzgxOTdkOTg=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
ZGMwYTBjOWFjMzliM2VlNTc0ZDZhNTZlYmQ3MDI1MjNhZDE3NjdmYTk2MDY3
|
|
14
|
+
OWNlOGJlZDAyZjQ4ODNmY2NkMDNhZjFmZmIzY2I1ZWYyNjdjMjRhZTEyYmE3
|
|
15
|
+
ZDQwZjcwNjQxMzEwZjU2MDdlMDY4Y2M4YWRhZjMwYjBlYWQyMTQ=
|
|
@@ -65,7 +65,7 @@ module Caboose
|
|
|
65
65
|
@params.each { |key, val|
|
|
66
66
|
next if !@options['abbreviations'].has_key?(key)
|
|
67
67
|
long_key = @options['abbreviations'][key]
|
|
68
|
-
new_params[long_key] = val
|
|
68
|
+
new_params[long_key] = post_get[key] ? post_get[key] : val
|
|
69
69
|
keys_to_delete << key
|
|
70
70
|
}
|
|
71
71
|
keys_to_delete.each { |k| @params.delete(k) }
|
|
@@ -89,26 +89,22 @@ module Caboose
|
|
|
89
89
|
m = @options['model'].constantize
|
|
90
90
|
return m if @options['includes'].nil?
|
|
91
91
|
|
|
92
|
-
# See if any fields that we know have includes have values
|
|
93
92
|
associations = []
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
# See if any fields that we know have includes have values
|
|
94
|
+
@params.each do |k,v|
|
|
95
|
+
next if v.nil? || (v.kind_of?(String) && k.length == 0)
|
|
96
|
+
k.split('_concat_').each do |k2|
|
|
97
|
+
next if !@options['includes'].has_key?(k2)
|
|
98
|
+
associations << @options['includes'][k2][0]
|
|
99
|
+
end
|
|
100
|
+
end
|
|
98
101
|
# See if any fields in the sort option are listed in a table_name.column_name format
|
|
99
102
|
if @options['sort']
|
|
100
103
|
@options['sort'].split(',').each do |col|
|
|
101
104
|
tbl_col = col.split('.')
|
|
102
105
|
associations << association_for_table_name(tbl_col[0]) if tbl_col && tbl_col.count > 1
|
|
103
106
|
end
|
|
104
|
-
end
|
|
105
|
-
# See if any parameters are listed in a table_name.column_name format
|
|
106
|
-
@params.each do |k,v|
|
|
107
|
-
k.split('_concat_').each do |col,v2|
|
|
108
|
-
tbl_col = col.split('.')
|
|
109
|
-
associations << association_for_table_name(tbl_col[0]) if tbl_col && tbl_col.count > 1
|
|
110
|
-
end
|
|
111
|
-
end
|
|
107
|
+
end
|
|
112
108
|
associations.uniq.each { |assoc| m = m.includes(assoc) }
|
|
113
109
|
return m
|
|
114
110
|
end
|
data/lib/caboose/version.rb
CHANGED