caboose-cms 0.4.89 → 0.4.90

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjNiMTkxYzhhODU2NWVlMWFhZjIyZjhkYWNmMDNhYmRkZDE3NjY0MA==
+    YTliYTBiMjVmMmEwY2NlNTFjYjY1MWI3Y2JmYjk2OWU3NDExMzRiZQ==
   data.tar.gz: !binary |-
-    ZjdiYjI3MDBlOTkwNWE2YWIzOTIzYTdjNjJkNGJjNGUxZGU5ODdkYw==
+    MjJhYWRjZGUzYWM0ZjcyY2IwYjJmNTAxZDFiOWU4NjllZGQ4MTRjMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjViOGZhMjdkNTdlMGJlZWM0MWYwNmY2MmIzMmI5YzI0YTJhODEwYjUyZmQ1
-    ZTU5OWZmZmIzMzFjMDIxMjQwZTU3MmFlNTYxMGEyZjU2ZWRiZjUyYTg5OTI3
-    NzBkYWNhZTJmMmVlYzVjN2M4NzEyZjFmNTU1ZjllZTVlMTExMTI=
+    OTdjMWMxNjcyMTcwYzAwNzk5MDVjNjZhYTE0NzhhZDFhMzJiNmVhZTAwNjNm
+    Zjg1YjljNGUwYzQ2ZDM0MWQyYzJkZGZhMTM5YmFkODkzMGViMzlkZTBkNDlm
+    N2M2MDk1MWY5Nzg0OTRhNDE5YmQ0NGNjNjRkOTZlZmRlMDUzNDM=
   data.tar.gz: !binary |-
-    YmNkZGNlOTAxNzVhMjk0ODliZTlmNjE5ODA2MDhhZDM5MWY0ZjNlMWFhNjkw
-    M2IzYWM4ZWVhMDBiZWEzNmNjYWVlYTQ5OTBjMzlkZDI5MzI3NjFhMTQ1OGY4
-    MDE2MDdlYmU2NTBkMzk3NTAyY2NlMjFmNjFlZTExNWQ3NDMyNjg=
+    ZThjNTdmZTYyNjg1M2FhMjkzNTkzNTA2MmUyZWQwYjliMGVjZTY2NmRlOGVm
+    ODc0MjU0OTIwNjRjMTY1MGY1NmJiYWNkZGE1M2FkMDg4ZWYwZTE1ZTI0ZDE3
+    ZGE5Y2ViOTZkMGIwMjBhMGVmMTA4OWExODY5NDBkZjJkOWM3Mzg=

data/app/controllers/caboose/block_types_controller.rb

@@ -72,6 +72,7 @@ module Caboose
           when 'parent_id'                       then bt.parent_id                      = v
           when 'name'                            then bt.name                           = v
           when 'description'                     then bt.description                    = v
+          when 'is_global'                       then bt.is_global                      = v
           when 'icon'                            then bt.icon                           = v
           when 'block_type_category_id'          then bt.block_type_category_id         = v
           when 'render_function'                 then bt.render_function                = v

data/app/controllers/caboose/blocks_controller.rb

@@ -193,8 +193,8 @@ module Caboose
       b = Block.new
       b.page_id = params[:page_id].to_i
       b.parent_id = params[:id] ? params[:id] : nil
-      b.block_type_id = params[:block_type_id] 
-                    
+      b.block_type_id = params[:block_type_id]
+                      
       if !params[:index].nil?      
         b.sort_order = params[:index].to_i
         
@@ -236,6 +236,11 @@ module Caboose
       
       # Ensure that all the children are created for the block
       b.create_children
+      
+      # Set the global values if necessary
+      if b.block_type.is_global        
+        b.get_global_value(@site.id)
+      end
 
       # Send back the response
       #resp.block = b
@@ -261,10 +266,16 @@ module Caboose
           when 'sort_order'    then b.sort_order    = v
           when 'name'          then b.name          = v
           when 'value'         then
-            if b.block_type.field_type == 'richtext' && (b.name.nil? || b.name.strip.length == 0)
-              b = RichTextBlockParser.parse(b, v, request.host_with_port)
-            else              
+            
+            if b.block_type.is_global              
               b.value = v
+              b.update_global_value(v, @site.id)              
+            else            
+              if b.block_type.field_type == 'richtext' && (b.name.nil? || b.name.strip.length == 0)
+                b = RichTextBlockParser.parse(b, v, request.host_with_port)
+              else              
+                b.value = v
+              end
             end
         end
       end

data/app/models/caboose/block.rb

@@ -2,6 +2,8 @@
 class Caboose::Block < ActiveRecord::Base
   self.table_name = "blocks"
   
+  #after_find :get_master_value
+  
   belongs_to :page
   belongs_to :block_type
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::Block'   
@@ -313,5 +315,30 @@ class Caboose::Block < ActiveRecord::Base
       b.log_helper("#{prefix}-")
     end
   end
+      
+  # Returns the master block for this global block 
+  def get_global_value(site_id)
+    return if !self.block_type.is_global    
+    return if !Caboose::Block.includes(:page).where("blocks.id <> ? and block_type_id = ? and pages.site_id = ?", self.id, self.block_type_id, site_id).exists?        
+    b = Caboose::Block.includes(:page).where("blocks.id <> ? and block_type_id = ? and pages.site_id = ?", self.id, self.block_type_id, site_id).reorder("blocks.id").first    
+    self.value = b.value
+    self.save
+    
+    self.children.each do |b2|
+      b2.get_global_value(site_id) if b2.block_type.is_global
+    end    
+  end
+  
+  # Updates all the global blocks for the given site
+  def update_global_value(value, site_id)
+    return if !self.block_type.is_global    
+    return if !Caboose::Block.includes(:page).where("blocks.id <> ? and block_type_id = ? and pages.site_id = ?", self.id, self.block_type_id, site_id).exists?        
+    
+    sql = ["update blocks set value = ? where id in (
+        select B.id from blocks B left join pages P on B.page_id = P.id
+        where B.id <> ? and B.block_type_id = ? and P.site_id = ?
+      )", value, self.id, self.block_type_id, site_id]       
+    ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, sql))            
+  end
 
 end

data/app/views/caboose/block_types/admin_edit.html.erb

@@ -18,6 +18,7 @@ bt = @block_type
 <p><div id='blocktype_<%= bt.id %>_fixed_placeholder'               ></div></p>
 <p><div id='blocktype_<%= bt.id %>_options_url'                     ></div></p>
 <p><div id='blocktype_<%= bt.id %>_options'                         ></div></p>
+<p><div id='blocktype_<%= bt.id %>_is_global'                       ></div></p>
 <p><div id='blocktype_<%= bt.id %>_use_render_function'             ></div></p>
 <p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p>
 <p><div id='blocktype_<%= bt.id %>_allow_child_blocks'              ></div></p>
@@ -127,6 +128,7 @@ $(document).ready(function() {
       { name: 'name'                           , nice_name: 'Name'                           , type: 'text'     , value: <%= raw Caboose.json(bt.name)                            %>, width: 400 },
       { name: 'description'                    , nice_name: 'Description'                    , type: 'text'     , value: <%= raw Caboose.json(bt.description)                     %>, width: 400 },
       { name: 'block_type_category_id'         , nice_name: 'Category'                       , type: 'select'   , value: <%= raw Caboose.json(bt.block_type_category_id)          %>, width: 400, options_url: '/admin/block-type-categories/tree-options' },
+      { name: 'is_global'                      , nice_name: 'Global'                         , type: 'checkbox' , value: <%= bt.is_global                      ? 'true' : 'false' %>, width: 400 },
       { name: 'use_render_function'            , nice_name: 'Use Render Function'            , type: 'checkbox' , value: <%= bt.use_render_function            ? 'true' : 'false' %>, width: 400 },
       { name: 'use_render_function_for_layout' , nice_name: 'Use Render Function for Layout' , type: 'checkbox' , value: <%= bt.use_render_function_for_layout ? 'true' : 'false' %>, width: 400 },
       { name: 'allow_child_blocks'             , nice_name: 'Allow Child Blocks'             , type: 'checkbox' , value: <%= bt.allow_child_blocks             ? 'true' : 'false' %>, width: 400 },

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.89'
+  VERSION = '0.4.90'
 end

metadata

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