caboose-cms 0.7.71 → 0.7.72
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
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b2e4df79c7201a278945dcce956f6670c8b1113a
|
4
|
+
data.tar.gz: 700a8d557a996d7a8e4d9d72fbb232f8bf4f57cf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f291b7f39bd93b2e423a8287e4e627156cc915600a3749a675c98852968e039975680ebe9c8e2e2a10b6423ac1ad91bca0e13df3992f952364464a95d418062f
|
7
|
+
data.tar.gz: 8075ccdff11db01e67c3ace26325c55228579c2a1c6f0ef164fd16329f63eb311059d8efe226660c624452e45fd6060117ce6cc2fdbf05a1e2c683f90797e528
|
@@ -63,6 +63,8 @@ module Caboose
|
|
63
63
|
when 'pp_password' then sc.pp_password = value
|
64
64
|
when 'pp_testing' then sc.pp_testing = value
|
65
65
|
when 'pp_relay_domain' then sc.pp_relay_domain = value
|
66
|
+
when 'stripe_secret_key' then sc.stripe_secret_key = value
|
67
|
+
when 'stripe_publishable_key' then sc.stripe_publishable_key = value
|
66
68
|
when 'ups_username' then sc.ups_username = value
|
67
69
|
when 'ups_password' then sc.ups_password = value
|
68
70
|
when 'ups_key' then sc.ups_key = value
|
data/app/models/caboose/block.rb
CHANGED
@@ -276,17 +276,41 @@ class Caboose::Block < ActiveRecord::Base
|
|
276
276
|
return erb.result(locals.instance_eval { binding })
|
277
277
|
end
|
278
278
|
|
279
|
-
def partial(name, options)
|
280
|
-
defaults = {
|
281
|
-
|
279
|
+
def partial(name, options)
|
280
|
+
defaults = {
|
281
|
+
:view => nil,
|
282
|
+
:controller_view_content => nil,
|
283
|
+
:modal => false,
|
284
|
+
:empty_text => '',
|
285
|
+
:editing => false,
|
286
|
+
:css => nil,
|
287
|
+
:js => nil,
|
288
|
+
:csrf_meta_tags => nil,
|
289
|
+
:csrf_meta_tags2 => nil,
|
290
|
+
:logged_in_user => nil
|
291
|
+
}
|
292
|
+
options2 = nil
|
282
293
|
if options.is_a?(Hash)
|
283
294
|
options2 = defaults.merge(options)
|
284
295
|
else
|
285
|
-
options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }
|
296
|
+
#options2 = { :modal => options.modal, :empty_text => options.empty_text, :editing => options.editing, :css => options.css, :js => options.js }
|
297
|
+
options2 = {
|
298
|
+
:view => options.view ? options.view : nil,
|
299
|
+
:controller_view_content => options.controller_view_content ? options.controller_view_content : nil,
|
300
|
+
:modal => options.modal ? options.modal : nil,
|
301
|
+
:empty_text => options.empty_text ? options.empty_text : nil,
|
302
|
+
:editing => options.editing ? options.editing : nil,
|
303
|
+
:css => options.css ? options.css : nil,
|
304
|
+
:js => options.js ? options.js : nil,
|
305
|
+
:csrf_meta_tags => options.csrf_meta_tags ? options.csrf_meta_tags : nil,
|
306
|
+
:csrf_meta_tags2 => options.csrf_meta_tags2 ? options.csrf_meta_tags2 : nil,
|
307
|
+
:logged_in_user => options.logged_in_user ? options.logged_in_user : nil
|
308
|
+
}
|
286
309
|
end
|
287
|
-
options2[:block] =
|
310
|
+
options2[:block] = block
|
288
311
|
|
289
|
-
view =
|
312
|
+
view = options2[:view]
|
313
|
+
view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?
|
290
314
|
site = options[:site]
|
291
315
|
|
292
316
|
begin
|
@@ -734,7 +734,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
|
|
734
734
|
[ :pp_username , :string ],
|
735
735
|
[ :pp_password , :string ],
|
736
736
|
[ :pp_testing , :boolean , { :default => true }],
|
737
|
-
[ :pp_relay_domain , :string ],
|
737
|
+
[ :pp_relay_domain , :string ],
|
738
|
+
[ :stripe_secret_key , :string ],
|
739
|
+
[ :stripe_publishable_key , :string ],
|
738
740
|
[ :ups_username , :string ],
|
739
741
|
[ :ups_password , :string ],
|
740
742
|
[ :ups_key , :string ],
|
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.7.
|
4
|
+
version: 0.7.72
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- William Barry
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-04-
|
11
|
+
date: 2016-04-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: pg
|