caboose-cms 0.3.58 → 0.3.59
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/app/models/caboose/page_bar_generator.rb +22 -7
- data/app/models/caboose/user.rb +1 -1
- data/lib/caboose.rb +4 -0
- data/lib/caboose/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MzYxMGM3OTFjZTExMzM3ODNlMGRkYWM5NjU0OWUzMjEzNWZiNGI0MQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZDE0N2YwOTExZWE3ZTU1NGFiODc5ZmJlMjEwMmYyYzMzODAzMWE5OQ==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
Y2ZkMzE2YjA1MWY5MjMwYzQwMTMwNjU2YTRlNTM3NTlkMTZiOTdjZWZjYzUy
|
10
|
+
N2IyZDI5OWY0MTUyZDI3ZTc2N2ZlMGZmY2U5NzU3M2VjMmJmZTJmOTI4Yzgx
|
11
|
+
MTZhMjNlNGQ4MzEyYzEzYjQwZGU0OWVkMTk0NmViYTBjMWRkMGI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NTY3MzU1NzhkYzY0ODE0YjJkZDE2ODM4NWZhYWRlMDA2ODJlOWI5MTg2NDIx
|
14
|
+
MGI2ZTVkNjQ5MjlkNGFiOTVjNDBmZGZmNzBiOGNkNjhhMjFlOTkyZjc2N2Zj
|
15
|
+
ZDkyYTFjOTA0OTNkYTI4YWIwYTE5N2IzNThkNTlmMTQ4Y2RmOGQ=
|
@@ -49,12 +49,26 @@ module Caboose
|
|
49
49
|
# }
|
50
50
|
}
|
51
51
|
params.each { |key, val| @params[key] = val }
|
52
|
-
options.each { |key, val| @options[key] = val }
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
52
|
+
options.each { |key, val| @options[key] = val }
|
53
|
+
|
54
|
+
#@params.each { |key, val|
|
55
|
+
# k = @options['abbreviations'].include?(key) ? @options['abbreviations'][key] : nil
|
56
|
+
# @params[key] = post_get[key].nil? ? (k && !post_get[k].nil? ? post_get[k] : val) : post_get[key]
|
57
|
+
#}
|
58
|
+
|
59
|
+
new_params = {}
|
60
|
+
keys_to_delete = []
|
61
|
+
@params.each { |key, val|
|
62
|
+
next if !@options['abbreviations'].has_key?(key)
|
63
|
+
long_key = @options['abbreviations'][key]
|
64
|
+
new_params[long_key] = val
|
65
|
+
keys_to_delete << key
|
66
|
+
}
|
67
|
+
keys_to_delete.each { |k| @params.delete(k) }
|
68
|
+
new_params.each { |k,v| @params[k] = v }
|
69
|
+
@params.each { |k,v| @params[k] = post_get[k] ? post_get[k] : v }
|
70
|
+
@options.each { |k,v| @options[k] = post_get[k] ? post_get[k] : v }
|
71
|
+
|
58
72
|
#@custom_url_vars = custom_url_vars if !custom_url_vars.nil?
|
59
73
|
@use_url_params = @options['use_url_params'].nil? ? Caboose.use_url_params : @options['use_url_params']
|
60
74
|
|
@@ -129,7 +143,8 @@ module Caboose
|
|
129
143
|
return true
|
130
144
|
end
|
131
145
|
|
132
|
-
def items
|
146
|
+
def items
|
147
|
+
Caboose.log(where)
|
133
148
|
assoc = model_with_includes.where(where)
|
134
149
|
if @options['items_per_page'] != -1
|
135
150
|
assoc = assoc.limit(limit).offset(offset)
|
data/app/models/caboose/user.rb
CHANGED
@@ -5,7 +5,7 @@ class Caboose::User < ActiveRecord::Base
|
|
5
5
|
has_many :roles, :through => :role_memberships
|
6
6
|
has_attached_file :image,
|
7
7
|
:path => 'users/:id_:style.:extension',
|
8
|
-
:default_url =>
|
8
|
+
:default_url => "#{Caboose::cdn_domain}/images/default_user_image.jpg",
|
9
9
|
:styles => {
|
10
10
|
:tiny => '150x200>',
|
11
11
|
:thumb => '300x400>',
|
data/lib/caboose.rb
CHANGED
@@ -42,6 +42,10 @@ module Caboose
|
|
42
42
|
mattr_accessor :website_domain
|
43
43
|
@@website_domain = "http://www.google.com"
|
44
44
|
|
45
|
+
# CDN domain
|
46
|
+
mattr_accessor :cdn_domain
|
47
|
+
@@cdn_domain = ""
|
48
|
+
|
45
49
|
# Email settings
|
46
50
|
mattr_accessor :email_from
|
47
51
|
@@email_from = "webmaster@caboosecms.com"
|
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.3.
|
4
|
+
version: 0.3.59
|
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-03-
|
11
|
+
date: 2014-03-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|