caboose-cms 0.9.209 → 0.9.210

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f240b8f7e43d86233a5fbe560e9ee1050f991d30982dbad188412742619969d
-  data.tar.gz: 676146fb8424d3236d64a0373002ea0bf0bba9a84a6d407cfeac607a67b283cb
+  metadata.gz: fa4b9f3f961e868b7baef178a2bc4c19e0bbe86ad159f886809c503b11c127ee
+  data.tar.gz: 6aee3e09b6a7565dd94c678c5f0918a880c8e2024d3b85caae811332dc94989b
 SHA512:
-  metadata.gz: faf13344ea43cb3262b6b915048c8b8a196e52b33a2bafc9ce62dbbe46f4451e1fa0f628d43d0e01654a19828088d1faff8166eeb5175cda9c60ca0a9475543c
-  data.tar.gz: '09efeee1d9f86edb50d910fab362d518a82dd8a124500385f14d520543469dbf232b4e48a70a32e8f2f1eeb1eaf762a4813dc0c34dc61b132d513a288944a167'
+  metadata.gz: 366712d4d4dc14b5e8de78c48352aab495452641ff37d05675b180199195267232a8ffdfd24ade7a747e444efa4827c405dc13016d6d8c47f6b06692e9b97e06
+  data.tar.gz: 0bf9f3779b3a90f8c6a2a2a459f662dae9aa7023eea5da03fb22bfc7a75cd1d8416e6a978afe952a575fbbc0ef713b1c4e282bcf7669d6d89789e899cfae445f

data/app/models/caboose/block.rb

@@ -52,13 +52,6 @@ class Caboose::Block < ActiveRecord::Base
       end      
       self.block_type_id = bt.id
     end
-    #if self.block_type_id.field_type.nil?
-    #  self.block_type.field_type = 'text'      
-    #end        
-    #if self.block_type.field_type == 'checkbox'
-    #  v = self.value
-    #  self.value = v ? (v == 1 || v == '1' || v == true ? 1 : 0) : 0        
-    #end
   end
   
   def full_name    
@@ -245,53 +238,8 @@ class Caboose::Block < ActiveRecord::Base
       if site.nil?
         self.block_message(block, "Error: site variable is nil.")
       end
-              
-      #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 => "../../sites/#{site.name}/blocks/#{block.block_type.field_type}", :locals => options2) 
-      #    rescue ActionView::MissingTemplate => ex            
-      #      begin str = view.render(:partial => "../../app/views/caboose/blocks/#{full_name}", :locals => options2) 
-      #      rescue ActionView::MissingTemplate => ex                                          
-      #        begin str = view.render(:partial => "../../app/views/caboose/blocks/#{block.block_type.name}", :locals => options2) 
-      #        rescue ActionView::MissingTemplate => ex                
-      #          begin str = view.render(:partial => "../../app/views/caboose/blocks/#{block.block_type.field_type}", :locals => options2) 
-      #          rescue ActionView::MissingTemplate => ex                  
-      #          begin str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)  
-      #          rescue ActionView::MissingTemplate => ex                  
-      #            begin str = view.render(:partial => "caboose/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 
-      #                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
-      #  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
       
       arr = [
-        #"../../sites/#{site.name}/blocks/#{full_name}",
-        #"../../sites/#{site.name}/blocks/#{block.block_type.name}",
-        #"../../sites/#{site.name}/blocks/#{block.block_type.field_type}",
-        #"../../app/views/caboose/blocks/#{full_name}",
-        #"../../app/views/caboose/blocks/#{block.block_type.name}",
-        #"../../app/views/caboose/blocks/#{block.block_type.field_type}",
-        #"caboose/blocks/#{full_name}",                
-        #"caboose/blocks/#{block.block_type.name}",                
-        #"caboose/blocks/#{block.block_type.field_type}"
-        
         "../../app/views/caboose/blocks/#{site.name}/#{full_name}",
         "../../app/views/caboose/blocks/#{site.name}/#{block.block_type.name}",
         "../../app/views/caboose/blocks/#{site.name}/#{block.block_type.field_type}",
@@ -305,10 +253,6 @@ class Caboose::Block < ActiveRecord::Base
         "caboose/blocks/#{block.block_type.field_type}"                
       ]
 
-    #  Caboose.log("searching #{arr.to_s}")
-      
-    #  Caboose.log("editing: " + options2[:editing].to_s)
-
       if options2[:editing] == true
         if !block.new_value.blank? && block.new_value != 'EMPTY'
           block.value = block.new_value 
@@ -316,32 +260,15 @@ class Caboose::Block < ActiveRecord::Base
           block.value = nil
         end
         block.media_id = block.new_media_id if !block.new_media_id.nil?
-       # block.sort_order = block.new_sort_order if !block.new_sort_order.blank?
-       # block.parent_id = block.new_parent_id if !block.new_parent_id.blank?
-       # Caboose.log("temp setting #{block.id}")
-        # block.children.each do |bc|
-        #   Caboose.log("temp setting #{bc.id}")
-        #   bc.value = bc.new_value if !bc.new_value.blank?
-        #   bc.sort_order = bc.new_sort_order if !bc.new_sort_order.blank?
-        #   bc.parent_id = bc.new_parent_id if !bc.new_parent_id.blank?
-        #   Caboose.log("bc value: #{bc.value}")
-        # end
-
-        # if block && block.id == 430363
-        #   Caboose.log( block.value )
-        # end
-
-        if block.status != 'deleted'  #&& ( block.new_parent_id.blank? || options2[:is_new] )
+        if block.status != 'deleted'
           str = self.render_helper(view, options2, block, full_name, arr, 0)
         end
-     #   str.gsub('child_value','edited_child_value')
       else
         if block.status != 'added'
           str = self.render_helper(view, options2, block, full_name, arr, 0)
         end
       end
 
-
     end    
     return str
   end
@@ -415,17 +342,20 @@ class Caboose::Block < ActiveRecord::Base
     view = options2[:view]     
     view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?        
     site = options[:site]
-    
+
     begin
-      #str = view.render(:partial => "../../sites/#{site.name}/blocks/#{name}", :locals => options2)
       str = view.render(:partial => "../../app/views/caboose/blocks/#{site.name}/#{name}", :locals => options2)
     rescue ActionView::MissingTemplate => ex      
       begin
-        str = view.render(:partial => "caboose/blocks/#{name}", :locals => options2)      
-      rescue Exception => ex
-        Caboose.log("Partial caboose/blocks/#{name} doesn't exist.")
-        str = "<p class='note error'>#{self.partial_message(name, ex)}</p>"
-      end      
+        str = view.render(:partial => "../../app/views/caboose/blocks/default_theme/#{name}", :locals => options2)
+      rescue ActionView::MissingTemplate => ex      
+        begin
+          str = view.render(:partial => "caboose/blocks/#{name}", :locals => options2)  
+        rescue Exception => ex      
+          Caboose.log("Partial caboose/blocks/#{name} doesn't exist.")
+          str = "<p class='note error'>#{self.partial_message(name, ex)}</p>"
+        end
+      end
     end
       
     return str
@@ -441,16 +371,6 @@ class Caboose::Block < ActiveRecord::Base
     return msg
   end
   
-  #def child_block_link        
-  #  return "<div class='new_block' id='new_block_#{self.id}'>New Block</div>"    
-  #end  
-  #def new_block_before_link        
-  #  return "<div class='new_block_before' id='new_block_before_#{self.id}'>New Block</div>"    
-  #end  
-  #def new_block_after_link        
-  #  return "<div class='new_block_after' id='new_block_after_#{self.id}'>New Block</div>"    
-  #end
-  
   def title    
     str = "#{self.block_type.name}"
     if self.name && self.name.strip.length > 0
@@ -549,7 +469,7 @@ class Caboose::Block < ActiveRecord::Base
     checked = arr[1].to_i == 1
     if v == 'all'
       if checked && b.block_type && !b.block_type.options.blank?
-        Caboose.log(b.block_type.options)
+        # Caboose.log(b.block_type.options)
         return b.block_type.options.split("\n").join('|')
       else
         return ''

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.209'
+  VERSION = '0.9.210'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.209
+  version: 0.9.210
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg