caboose-cms 0.4.76 → 0.4.77

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y3YmE1NTY2MGQ1NjUwOTBjN2Y2NTVlNDdjYjRkNWI5NDJiZTE0Mw==
+    ZWNiYmIwMWM2NDg0YjEzNzQ1MWFhOTMzYjQyOTM5N2I3ZjQxOTM0Mw==
   data.tar.gz: !binary |-
-    ZDc5Y2Y5ZWUxZjY1MDc4ZTRmNzM2ZThjNWI5MWYwODhjZjMyODkxZQ==
+    YjI3ZDM1YTczMTUxNjUzNjgxNWYwMjUyOTQ0MDRkY2JhOTQ2Mzg5NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGJjYjI2M2IyZGYxYTE3YmFkZDhmYTY2YzZiM2Y2OGEyYjI3MGNmZjM1YjVl
-    MTFhNDU2MGE5NWU3ZTc0NTYwYTQ0NmNmZTkxYTMzODE2NThmZDkxMjE1ODQw
-    MDMzOTk1YzViZjExZDE3MjFhNDMzY2EwZjA3MzQ4ZDI1ZWRmODg=
+    ZDY0YTQ5MGI4MjRmNDdjNjA5OWQ4ODEzNTM0MTRjN2Q2NjY5YjgyMDU0ODJj
+    MjgxMmY4MGYwNTMwNzgyNGJmYzMxYzEyMWJjZGY3N2Q4MWEwZDE0MTFlNzNk
+    MWE3NWQ4ZGQ4ZjcyYTc3YjVlZTFkZDJmYzBhMzc0ZTM5ZTI1ZTM=
   data.tar.gz: !binary |-
-    NGI3MGVhZmI4ODI4MzA4OGZiNGI2MDU0OTliNjU4MTZlNjA5NmY1ZGVmNDEy
-    NjkxMTUyZDZhMzMwZjU1Y2Q3ZGI3MmYzODhlOWRlYTM1NDgyZTlhNjgxZDhk
-    NDY5M2Q0MzM5YzAxMDA2MWFjOWY4NjE5Y2ZlMmFjZGFhZTAyY2M=
+    NmEzYjYwZmM2NDkzMjkwM2M4MGI1M2E0YmIwMWNhMzg2Y2M4ZWZhYjc4ZGEy
+    M2NmNjZkYTdlZDljOTc4MzQyNjJiNDljMDYxYzQyZTc0N2ZkYjg1ZGRjNTE5
+    NzQ3OWMzYzE0OTgyYmJmZGU5MDE4NjkwZGQyNjQ4NGM0N2NmOWQ=

data/app/models/caboose/block.rb

@@ -159,36 +159,56 @@ class Caboose::Block < ActiveRecord::Base
         str = "<p class='note error'>#{msg}</p>"
       end            
     else
-      #view = ActionView::Base.new(ActionController::Base.view_paths, options2, )      
-      #view = ActionView::Base.new(options2[:view].view_renderer, {}, options2[:view].controller)      
-      begin        
-        full_name = block.block_type.full_name
-        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0        
-        str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)        
-      rescue ActionView::MissingTemplate
-        begin          
-          str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)                    
-        rescue ActionView::MissingTemplate
+      
+      # Check the local site first      
+      site = options2[:site]
+      full_name = block.block_type.full_name
+      full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0
+        
+      begin                        
+        str = view.render(:partial => "../../sites/#{site.name}/blocks/#{full_name}", :locals => options2)        
+      rescue ActionView::MissingTemplate => ex
+        begin
+          str = view.render(:partial => "../../sites/#{site.name}/blocks/#{block.block_type.name}", :locals => options2)                    
+        rescue ActionView::MissingTemplate => ex
           begin                        
-            str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)            
-          rescue Exception => ex
-            msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
-            Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
-            str = "<p class='note error'>#{msg}</p>"
-          end
-        rescue Exception => ex          
-          msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
-          Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
-          str = "<p class='note error'>#{msg}</p>"
-        end
-      rescue Exception => ex
-        msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
-        Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
-        str = "<p class='note error'>#{msg}</p>"
-      end        
+            str = view.render(:partial => "../../sites/#{site.name}/blocks/#{block.block_type.field_type}", :locals => options2)            
+          rescue ActionView::MissingTemplate
+            begin
+              str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)        
+            rescue ActionView::MissingTemplate
+              begin          
+                str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)                    
+              rescue ActionView::MissingTemplate
+                begin                        
+                  str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)            
+                rescue Exception => ex                  
+                  str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
+                end
+              rescue Exception => ex                          
+                str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
+              end
+            rescue Exception => ex              
+              str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
+            end
+          rescue Exception => ex                  
+            str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
+          end                              
+        rescue Exception => ex                                                     
+          str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
+        end        
+      rescue Exception => ex        
+        str = "<p class='note error'>#{self.block_message(block, ex)}</p>"
+      end                    
     end
     return str
   end
+  
+  def block_message(block, ex)
+    msg = block ? (block.block_type ? "Error with #{block.block_type.name} block (block_type_id #{block.block_type.id}, block_id #{block.id})\n" : "Error with block (block_id #{block.id})\n") : ''             
+    Caboose.log("#{msg}#{ex.message}\n#{ex.backtrace.join("\n")}")
+    return msg
+  end
 
   def render_from_function(options)
     self.create_children    

data/app/views/layouts/caboose/application.html.erb

@@ -24,7 +24,7 @@
     b.create_children
   end
   #b.log_helper
-  str = b.render(b, {     
+  str = b.render(b, {      
     :view => self,
     :controller_view_content => yield,
     :modal => false,
@@ -34,7 +34,8 @@
     :js => '|CABOOSE_JAVASCRIPT|',
     :csrf_meta_tags => '|CABOOSE_CSRF|',
     :csrf_meta_tags2 => '|CABOOSE_CSRF|',    
-    :logged_in_user => @logged_in_user
+    :logged_in_user => @logged_in_user,
+    :site => @site
   })       
   str.gsub!('|CABOOSE_CSS|'        , yield(:css))
   str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.76'
+  VERSION = '0.4.77'
 end

metadata

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