caboose-cms 0.4.38 → 0.4.39
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
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ZjA2M2JlNTM5NzZjNTlmZDAyYWVlODlmZjMyNmY5NDFjMTRkZDZhMA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
OTA2NDJkMWMxNjQyNmQ2N2I5ZjIwYWE5MDg0MjQ2OWZhMDcwNDYzOA==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
ZWFjOGE4ZTA2NTg1YjhjNDc2NDhiMDQxNDJlNDE4Y2UxNTE4ZDJiNzE1ZTE2
|
10
|
+
MzVkYjkyYWNmYTA2Y2Q5MDY0YWE2YTg5MTQwMmM2OWQ1MjM4OTU3YWNhODFh
|
11
|
+
MmUxMjEwNzQ1MzMwYmRmMzQyYzM5ZjQzYjg5ZDYxYjliZWExZWI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NGNjOTIwY2I1MDc1MDczZTY3MzdmNDFmYTI1NDkwMTM1MDNkY2Q5NDUzODhi
|
14
|
+
NTZkNTYwNDlmMWU4NGI5MmM0YTU0NjZkZTY1MWIzNDgxNDQ2NWNmY2UyMjQ2
|
15
|
+
MmM5N2VhZTYwZTFkMzFhOGJmZTkzMGY2MDVjYzMzNDljZDUwYjQ=
|
@@ -53,13 +53,17 @@ module Caboose
|
|
53
53
|
|
54
54
|
page = Page.page_with_uri(File.dirname(uri), false)
|
55
55
|
if (page.nil? || !page)
|
56
|
-
|
56
|
+
respond_to do |format|
|
57
|
+
format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
|
58
|
+
end
|
57
59
|
return
|
58
60
|
end
|
59
61
|
|
60
62
|
asset = Asset.where(:page_id => page.id, :filename => File.basename(uri)).first
|
61
63
|
if (asset.nil?)
|
62
|
-
|
64
|
+
respond_to do |format|
|
65
|
+
format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
|
66
|
+
end
|
63
67
|
return
|
64
68
|
end
|
65
69
|
|
@@ -34,16 +34,17 @@ module Caboose
|
|
34
34
|
@original_params = {}
|
35
35
|
@params = {}
|
36
36
|
@options = {
|
37
|
-
'model'
|
38
|
-
'sort'
|
39
|
-
'desc'
|
40
|
-
'base_url'
|
41
|
-
'page'
|
42
|
-
'item_count'
|
43
|
-
'items_per_page'
|
44
|
-
'abbreviations'
|
45
|
-
'skip'
|
46
|
-
|
37
|
+
'model' => '',
|
38
|
+
'sort' => '',
|
39
|
+
'desc' => 0,
|
40
|
+
'base_url' => '',
|
41
|
+
'page' => 1,
|
42
|
+
'item_count' => 0,
|
43
|
+
'items_per_page' => 10,
|
44
|
+
'abbreviations' => {},
|
45
|
+
'skip' => [], # params to skip when printing the page bar
|
46
|
+
'additional_where' => [],
|
47
|
+
'includes' => nil # Hash of association includes
|
47
48
|
# {
|
48
49
|
# search_field_1 => [association_name, join_table, column_name],
|
49
50
|
# search_field_2 => [association_name, join_table, column_name]
|
@@ -333,6 +334,7 @@ module Caboose
|
|
333
334
|
arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_bw')
|
334
335
|
arr[arr.count-1] = arr[arr.count-1][0..-4] if k.ends_with?('_ew')
|
335
336
|
arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_like')
|
337
|
+
arr[arr.count-1] = arr[arr.count-1][0..-6] if k.ends_with?('_null')
|
336
338
|
arr2 = []
|
337
339
|
arr.each do |col|
|
338
340
|
if @options['includes'] && @options['includes'].include?(col)
|
@@ -370,6 +372,10 @@ module Caboose
|
|
370
372
|
col = "#{table}.#{k[0..-6]}" if col.nil?
|
371
373
|
sql2 = "upper(#{col}) like ?"
|
372
374
|
v = v.kind_of?(Array) ? v.collect{ |v2| "%#{v2}%".upcase } : "%#{v}%".upcase
|
375
|
+
elsif k.ends_with?('_null')
|
376
|
+
col = "#{table}.#{k[0..-6]}" if col.nil?
|
377
|
+
sql2 = "#{col} ? null"
|
378
|
+
v = v == true ? 'is' : 'is not'
|
373
379
|
else
|
374
380
|
col = "#{table}.#{k}" if col.nil?
|
375
381
|
sql2 = "#{col} = ?"
|
@@ -383,6 +389,7 @@ module Caboose
|
|
383
389
|
end
|
384
390
|
sql << sql2
|
385
391
|
end
|
392
|
+
@options['additional_where'].each { |x| sql << x }
|
386
393
|
sql_str = sql.join(' and ')
|
387
394
|
sql = [sql_str]
|
388
395
|
values.each { |v| sql << v }
|
@@ -15,6 +15,12 @@
|
|
15
15
|
<% end %>
|
16
16
|
<%
|
17
17
|
b = @page.block
|
18
|
+
if b.nil?
|
19
|
+
bt = Caboose::BlockType.where(:name => 'layout_basic').first
|
20
|
+
Caboose::Block.create(:page_id => @page.id, :block_type_id => bt.id)
|
21
|
+
b = @page.block
|
22
|
+
b.create_children
|
23
|
+
end
|
18
24
|
str = b.render(b, {
|
19
25
|
:view => self,
|
20
26
|
:controller_view_content => yield,
|
@@ -23,8 +29,9 @@
|
|
23
29
|
:editing => defined?(@editing) ? @editing : false,
|
24
30
|
:css => '|CABOOSE_CSS|',
|
25
31
|
:js => '|CABOOSE_JAVASCRIPT|',
|
26
|
-
:csrf_meta_tags => '|CABOOSE_CSRF|'
|
27
|
-
|
32
|
+
:csrf_meta_tags => '|CABOOSE_CSRF|',
|
33
|
+
:logged_in_user => @logged_in_user
|
34
|
+
})
|
28
35
|
str.gsub!('|CABOOSE_CSS|' , yield(:css))
|
29
36
|
str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))
|
30
37
|
str.gsub!('|CABOOSE_CSRF|' , csrf_meta_tags)
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: caboose-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.39
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- William Barry
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-07-
|
11
|
+
date: 2014-07-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|