caboose-cms 0.4.13 → 0.4.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/app/controllers/caboose/pages_controller.rb +1 -0
- data/app/models/caboose/block.rb +12 -5
- 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
|
+
YTM3MDNkYTY4Nzc4Y2Y1Nzg5MjQ3ODkzYTgxMTc2MDlmYTE1OWU3ZA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MmFkOTdmNDFlYTIzNGFiYzc3ZWJlYWVlM2U2ZTYxZGZjZjMyYTdjMQ==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MDkzODZiODZlNjFmNmMyNWQ4YTVjNjI2NjQyYzhmMmExOWVlNzMyOTEyOTA2
|
10
|
+
YTlmMjY4ZGY2NGRkYjgyNzhiOGZiZGE5NzMzYTcwNTBlMmU5OWQzZWE0MTk2
|
11
|
+
YmFmODI0ODczNzdhOGZiMDhmNjg3ZTJlNDI0ZjVjNWQyZDhkMTU=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MmY4NGM2YjhlYTVhNmMyNjMyY2ZiZDNkMzBlNjU3ZDkzM2RjODc4MTk5MmUz
|
14
|
+
NDY5NmJmYTc4ZGNhNjFjYTdkNjQzMjA1ZWIyMDg5OTY4ZTc4NTc4ZTAzOWI4
|
15
|
+
ZWY1MDFhNmUzYTExNWUyNjNkNjJjMzJmNmM0NjFhOWQ0YjY3MGI=
|
@@ -149,6 +149,7 @@ module Caboose
|
|
149
149
|
def admin_update_layout
|
150
150
|
return unless user_is_allowed('pages', 'edit')
|
151
151
|
bt = BlockType.find(params[:block_type_id])
|
152
|
+
Block.where(:page_id => params[:id]).destroy_all
|
152
153
|
Block.create(:page_id => params[:id], :block_type_id => params[:block_type_id], :name => bt.name)
|
153
154
|
resp = Caboose::StdClass.new({
|
154
155
|
'redirect' => "/admin/pages/#{params[:id]}/content"
|
data/app/models/caboose/block.rb
CHANGED
@@ -119,21 +119,28 @@ class Caboose::Block < ActiveRecord::Base
|
|
119
119
|
else
|
120
120
|
view = ActionView::Base.new(ActionController::Base.view_paths)
|
121
121
|
begin
|
122
|
-
|
122
|
+
full_name = block.full_name
|
123
|
+
full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
|
124
|
+
#Caboose.log("Rendering caboose/blocks/#{full_name}")
|
125
|
+
str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)
|
123
126
|
rescue ActionView::MissingTemplate
|
124
127
|
begin
|
128
|
+
#Caboose.log("Error rendering caboose/blocks/#{full_name}")
|
129
|
+
#Caboose.log("Rendering caboose/blocks/#{block.block_type.name}")
|
125
130
|
str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
|
126
131
|
rescue ActionView::MissingTemplate
|
127
132
|
begin
|
133
|
+
#Caboose.log("Error rendering caboose/blocks/#{block.block_type.name}")
|
134
|
+
#Caboose.log("Error rendering caboose/blocks/#{block.block_type.field_type}")
|
128
135
|
str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
|
129
136
|
rescue Exception => ex
|
130
|
-
Caboose.log(ex.message)
|
137
|
+
Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
|
131
138
|
end
|
132
|
-
rescue Exception => ex
|
133
|
-
Caboose.log(ex.message)
|
139
|
+
rescue Exception => ex
|
140
|
+
Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
|
134
141
|
end
|
135
142
|
rescue Exception => ex
|
136
|
-
Caboose.log(ex.message)
|
143
|
+
Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
|
137
144
|
end
|
138
145
|
end
|
139
146
|
return str
|
data/lib/caboose/version.rb
CHANGED