caboose-cms 0.4.13 → 0.4.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2YzOTdhNGY3OTg5YTk2ODhlNWZiZDc2ZmY3Zjk0NDk0MjRhY2NjNw==
+    YTM3MDNkYTY4Nzc4Y2Y1Nzg5MjQ3ODkzYTgxMTc2MDlmYTE1OWU3ZA==
   data.tar.gz: !binary |-
-    YmUwMGNmNDcyMDM3MjBjZWQwZTRjZmYwZGUxMDVlMjcxNDM3Y2QxMQ==
+    MmFkOTdmNDFlYTIzNGFiYzc3ZWJlYWVlM2U2ZTYxZGZjZjMyYTdjMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWQxNjBiZDU1NmY0ZWZmYTM5ZTgyOGJlZDM0MWJiNjBjNDRmNjcyODc1NjYx
-    YzdhZWU1MDlmZjNmZTFkOGY5ZWIwYTg5NjdiOTFhM2IzYzUxNWM0ZmNkZDdh
-    NjRhMmQyMmYwOWZjZGI3Y2Y1MzU2OTRhNzZmZWE5ZGYwZDZmZjQ=
+    MDkzODZiODZlNjFmNmMyNWQ4YTVjNjI2NjQyYzhmMmExOWVlNzMyOTEyOTA2
+    YTlmMjY4ZGY2NGRkYjgyNzhiOGZiZGE5NzMzYTcwNTBlMmU5OWQzZWE0MTk2
+    YmFmODI0ODczNzdhOGZiMDhmNjg3ZTJlNDI0ZjVjNWQyZDhkMTU=
   data.tar.gz: !binary |-
-    YTIyNTUyYmY5N2UyMGVhMjQ5Y2Q3YmU2NWQ0MjY4NjdhYmM5ZWZlY2IzMzkz
-    ODJkYjUzOTc5MzAzODBiODMwNTMzNWJlYWIxYWYwZTM5ODZkOGRhMzg3ZWQ2
-    MDA3NzE2ZDMwNGRkNGVkMzc4YTlhOTYzZDE1ZTk5MmZkNTk1ZDY=
+    MmY4NGM2YjhlYTVhNmMyNjMyY2ZiZDNkMzBlNjU3ZDkzM2RjODc4MTk5MmUz
+    NDY5NmJmYTc4ZGNhNjFjYTdkNjQzMjA1ZWIyMDg5OTY4ZTc4NTc4ZTAzOWI4
+    ZWY1MDFhNmUzYTExNWUyNjNkNjJjMzJmNmM0NjFhOWQ0YjY3MGI=

data/app/controllers/caboose/pages_controller.rb

@@ -149,6 +149,7 @@ module Caboose
     def admin_update_layout
       return unless user_is_allowed('pages', 'edit')      
       bt = BlockType.find(params[:block_type_id])
+      Block.where(:page_id => params[:id]).destroy_all
       Block.create(:page_id => params[:id], :block_type_id => params[:block_type_id], :name => bt.name)
       resp = Caboose::StdClass.new({
         'redirect' => "/admin/pages/#{params[:id]}/content"

data/app/models/caboose/block.rb

@@ -119,21 +119,28 @@ class Caboose::Block < ActiveRecord::Base
     else
       view = ActionView::Base.new(ActionController::Base.view_paths)
       begin        
-        str = view.render(:partial => "caboose/blocks/#{block.full_name}", :locals => options2)
+        full_name = block.full_name
+        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
+        #Caboose.log("Rendering caboose/blocks/#{full_name}")
+        str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)
       rescue ActionView::MissingTemplate
         begin
+          #Caboose.log("Error rendering caboose/blocks/#{full_name}")
+          #Caboose.log("Rendering caboose/blocks/#{block.block_type.name}")
           str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)          
         rescue ActionView::MissingTemplate
           begin
+            #Caboose.log("Error rendering caboose/blocks/#{block.block_type.name}")
+            #Caboose.log("Error rendering caboose/blocks/#{block.block_type.field_type}")            
             str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
           rescue Exception => ex
-            Caboose.log(ex.message)
+            Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
           end
-        rescue Exception => ex
-          Caboose.log(ex.message)
+        rescue Exception => ex          
+          Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
         end
       rescue Exception => ex
-        Caboose.log(ex.message)
+        Caboose.log("#{ex.message}\n#{ex.backtrace.join("\n")}")
       end        
     end
     return str

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.13'
+  VERSION = '0.4.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - William Barry