caboose-cms 0.9.133 → 0.9.134

data/app/controllers/caboose/pages_controller.rb

@@ -145,6 +145,22 @@ module Caboose
     #===========================================================================
     # Admin actions
     #===========================================================================
+
+    # @route GET /admin/pages/:id/publish
+    def admin_publish
+      return unless user_is_allowed('pages', 'edit')
+      page = Page.find(params[:id])
+      page.publish
+      redirect_to "/admin/pages/#{page.id}/content"
+    end
+
+    # @route GET /admin/pages/:id/revert
+    def admin_revert
+      return unless user_is_allowed('pages', 'edit')
+      page = Page.find(params[:id])
+      page.revert
+      redirect_to "/admin/pages/#{page.id}/content"
+    end
     
     # @route GET /admin/pages
     def admin_index
@@ -205,7 +221,25 @@ module Caboose
         redirect_to "/admin/pages/#{@page.id}/layout"
         return
       end
+      Caboose::Block.where(:page_id => @page.id, :new_sort_order => nil).update_all('new_sort_order = sort_order')
+      Caboose::Block.where(:page_id => @page.id, :status => nil).update_all(:status => 'published')
+    #  Caboose::Block.where(:page_id => @page.id, :new_parent_id => nil).update_all('new_parent_id = parent_id')
+      @editing = true
+      @preview = false
+    end
+
+    # @route GET /admin/pages/:id/preview
+    def admin_preview
+      @page = Page.find(params[:id])
+      redirect_to "/login?return_url=/admin/pages/#{@page.id}/preview" and return if @logged_in_user.nil?
+      condition = @logged_in_user && (@logged_in_user.is_super_admin? || (@logged_in_user.site_id == @page.site_id && ( @logged_in_user.is_allowed('all','all') || @logged_in_user.is_allowed('pages','edit') && Page.permissible_actions(@logged_in_user, @page.id).include?('edit'))))
+      redirect_to "/admin/pages" and return unless condition
+      if @page.block.nil?
+        redirect_to "/admin/pages/#{@page.id}/layout"
+        return
+      end
       @editing = true
+      @preview = true
     end
     
     # @route GET /admin/pages/:id/layout

data/app/controllers/caboose/posts_controller.rb

@@ -75,6 +75,22 @@ module Caboose
       @post = Post.find(params[:id])      
       render :layout => 'caboose/admin'
     end
+
+    # @route GET /admin/posts/:id/publish
+    def admin_publish
+      return unless user_is_allowed('posts', 'edit')
+      post = Post.find(params[:id])
+      post.publish
+      redirect_to "/admin/posts/#{post.id}/content"
+    end
+
+    # @route GET /admin/posts/:id/revert
+    def admin_revert
+      return unless user_is_allowed('posts', 'edit')
+      post = Post.find(params[:id])
+      post.revert
+      redirect_to "/admin/posts/#{post.id}/content"
+    end
     
     # @route GET /admin/posts/:id/content
     def admin_edit_content
@@ -89,7 +105,18 @@ module Caboose
         redirect_to "/admin/posts/#{@post.id}/layout"
         return
       end
+      Caboose::Block.where(:post_id => @post.id, :new_sort_order => nil).update_all('new_sort_order = sort_order')
+      Caboose::Block.where(:post_id => @post.id, :status => nil).update_all(:status => 'published')
+      @editing = true
+      @preview = false
+    end
+
+    # @route GET /admin/posts/:id/preview-post
+    def admin_preview_post
+      return if !user_is_allowed('posts', 'edit')    
+      @post = Post.find(params[:id])
       @editing = true
+      @preview = true
     end
     
     # @route GET /admin/posts/:id/categories

data/app/models/caboose/block.rb

@@ -9,7 +9,7 @@ class Caboose::Block < ActiveRecord::Base
   belongs_to :media
   belongs_to :block_type
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::Block'   
-  has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::Block', :dependent => :delete_all, :order => 'sort_order'
+  has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::Block', :order => 'sort_order, id' # :dependent => :delete_all
   has_attached_file :file, :path => ':caboose_prefixuploads/:block_file_upload_name.:extension'
   do_not_validate_attachment_file_type :file  
   has_attached_file :image,
@@ -33,7 +33,12 @@ class Caboose::Block < ActiveRecord::Base
     :constrain,
     :full_width,
     :name,
-    :value            
+    :value,
+    :status,
+    :new_parent_id,
+    :new_sort_order,
+    :new_value,
+    :new_media_id
         
   after_initialize :caste_value
   before_save :caste_value
@@ -70,10 +75,35 @@ class Caboose::Block < ActiveRecord::Base
     if b.block_type.field_type == 'file'
       return b.media.file if b.media
       return b.file
-    end    
+    end
     #return b.image if b.block_type.field_type == 'image'
-    #return b.file  if b.block_type.field_type == 'file'        
-    return b.value        
+    #return b.file  if b.block_type.field_type == 'file'
+    return b.value
+  end
+
+  def cv(editing, name)
+    editing = defined?(editing) ? editing : false
+    b = self.child(name)
+    return nil if b.nil?
+    if b.block_type.field_type == 'image' && !editing
+      return b.media.image if b.media
+      return b.image
+    end
+    if b.block_type.field_type == 'image' && editing
+      mid = b.new_media_id.blank? ? b.media_id : b.new_media_id
+      return Caboose::Media.find(mid).image if Caboose::Media.where(:id => mid).exists?
+      return (mid != 0 ? b.image : nil)
+    end
+    if b.block_type.field_type == 'file' && !editing
+      return b.media.file if b.media
+      return b.file
+    end
+    if b.block_type.field_type == 'file' && editing
+      mid = b.new_media_id.blank? ? b.media_id : b.new_media_id
+      return Caboose::Media.find(mid).file if Caboose::Media.where(:id => mid).exists?
+      return (mid != 0 ? b.file : nil)
+    end
+    return (editing && !b.new_value.blank?) ? (b.new_value == 'EMPTY' ? nil : b.new_value) : b.value
   end
   
   def rendered_child_value(name, options)
@@ -95,8 +125,19 @@ class Caboose::Block < ActiveRecord::Base
   def child(name)
     Caboose::Block.where("parent_id = ? and name = ?", self.id, name).first
   end
+
+  def filtered_children(editing, sort_by_id = false)
+    blocks = []
+    if editing
+      sortby = sort_by_id ? 'block_type_id' : 'new_sort_order,id'
+      blocks = Caboose::Block.where("new_parent_id = ? or (parent_id = ? and new_parent_id is null)", self.id, self.id).order(sortby)
+    else
+      blocks = Caboose::Block.where(:parent_id => self.id).order('sort_order,id')
+    end
+    return blocks
+  end
   
-  def create_children(block_type_override = nil)
+  def create_children(block_type_override: nil, status: 'published')
     bt = block_type_override ? block_type_override : block_type
     bt.children.each do |bt2|
       bt_id = bt2.id      
@@ -110,9 +151,10 @@ class Caboose::Block < ActiveRecord::Base
           :parent_id => self.id, 
           :block_type_id => bt_id,
           :name => bt2.name,
-          :value => bt2.default
+          :value => bt2.default,
+          :status => status
         )
-        b.create_children(bt2)
+        b.create_children(block_type_override: bt2, status: status)
       end
     end
   end
@@ -246,8 +288,41 @@ class Caboose::Block < ActiveRecord::Base
         "caboose/blocks/#{block.block_type.name}",                
         "caboose/blocks/#{block.block_type.field_type}"                
       ]
-      #Caboose.log(arr)
-      str = self.render_helper(view, options2, block, full_name, arr, 0)
+      
+    #  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 
+        elsif block.new_value == 'EMPTY'
+          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] )
+          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
@@ -461,20 +536,27 @@ class Caboose::Block < ActiveRecord::Base
     end
     return current_value.join('|')
   end
+
+  # block siblings (in editing mode)
+  def siblings(min_sort_order=0)
+    Caboose::Block.where(:name => nil).where('new_sort_order >= ?',min_sort_order).where("(new_parent_id is null and parent_id = ? and status != ?) OR (new_parent_id = ? and status != ?)",self.parent_id,'deleted',self.parent_id,'deleted').order(:new_sort_order, :id).all
+  end
   
   # Move a block up
   def move_up    
-    siblings = Caboose::Block.where(:parent_id => self.parent_id).reorder(:sort_order).all        
-    siblings.each_with_index do |b2, i|      
-      b2.sort_order = i
+    sibs = self.siblings
+    sibs.each_with_index do |b2, i|      
+      b2.new_sort_order = i
+      b2.status = 'edited' if b2.status == 'published'
       b2.save
     end
     changed = false
-    siblings.each_with_index do |b2, i|      
+    sibs.each_with_index do |b2, i|      
       if i > 0 && b2.id == self.id                
-        siblings[i-1].sort_order = i
-        siblings[i-1].save        
-        b2.sort_order = i - 1
+        sibs[i-1].new_sort_order = i
+        sibs[i-1].save        
+        b2.new_sort_order = i - 1
+        b2.status = 'edited' if b2.status == 'published'
         b2.save
         changed = true
       end      
@@ -484,23 +566,35 @@ class Caboose::Block < ActiveRecord::Base
   
   # Move a block down
   def move_down
-    siblings = Caboose::Block.where(:parent_id => self.parent_id).reorder(:sort_order).all        
-    siblings.each_with_index do |b2, i|      
-      b2.sort_order = i
+    sibs = self.siblings
+    sibs.each_with_index do |b2, i|      
+      b2.new_sort_order = i
+      b2.status = 'edited' if b2.status == 'published'
       b2.save
     end
     changed = false
-    siblings.each_with_index do |b2, i|      
-      if i < (siblings.count-1) && b2.id == self.id                
-        siblings[i+1].sort_order = i
-        siblings[i+1].save        
-        b2.sort_order = i + 1
+    sibs.each_with_index do |b2, i|      
+      if i < (sibs.count-1) && b2.id == self.id                
+        sibs[i+1].new_sort_order = i
+        sibs[i+1].save        
+        b2.new_sort_order = i + 1
+        b2.status = 'edited' if b2.status == 'published'
         b2.save
         changed = true
       end      
     end
     return changed            
   end
+
+  # fix sort orders
+  def reorganize
+    sibs = self.siblings
+    sibs.each_with_index do |b2, i|      
+      b2.new_sort_order = i
+      b2.status = 'edited' if b2.status == 'published'
+      b2.save
+    end     
+  end
   
   def constrain_all         
     self.children.each do |b|
@@ -623,14 +717,24 @@ class Caboose::Block < ActiveRecord::Base
       :post_id            => post_id,         
       :parent_id          => new_parent_id,
       :media_id           => self.media_id,
+      :new_media_id       => self.new_media_id,
       :block_type_id      => self.block_type_id,    
-      :sort_order         => self.sort_order + 1,
+      :sort_order         => (self.new_sort_order.blank? ? (self.sort_order) : (self.new_sort_order)),
+      :new_sort_order     => (self.new_sort_order.blank? ? (self.sort_order) : (self.new_sort_order)),
       :constrain          => self.constrain,
       :full_width         => self.full_width,
       :name               => self.name,
-      :value              => self.value
+      :value              => self.value,
+      :new_value          => self.new_value,
+      :status             => 'added'
     )
-    self.children.each do |b2|
+
+    if b.name.nil?
+ #     Caboose.log("moving block #{b.id} down, parent_id is #{b.parent_id}")
+      b.reorganize
+    end
+
+    self.filtered_children(true).each do |b2|
       if b2.name 
         # The block is part of the block type, so we have to find the corresponding child block in the new block type        
         bt = Caboose::BlockType.where(:parent_id => self.block_type_id, :name => b2.name).first
@@ -650,7 +754,7 @@ class Caboose::Block < ActiveRecord::Base
   def modal_js_block_names
     arr = []
     arr << self.block_type.name if self.block_type.use_js_for_modal
-    self.children.each do |b2|
+    self.filtered_children(true).each do |b2|
       self.modal_js_controllers_helper(b2, arr)
     end
     return arr
@@ -659,7 +763,7 @@ class Caboose::Block < ActiveRecord::Base
   def modal_js_controllers_helper(b, arr)
     bt = b.block_type
     arr << bt.name if bt.use_js_for_modal
-    b.children.each do |b2|
+    b.filtered_children(true).each do |b2|
       self.modal_js_controllers_helper(b2, arr)
     end                          
   end

data/app/models/caboose/page.rb

@@ -35,7 +35,8 @@ class Caboose::Page < ActiveRecord::Base
     :meta_robots           ,
     :canonical_url         ,
     :fb_description        ,
-    :gp_description
+    :gp_description        ,
+    :status
    
   CONTENT_FORMAT_HTML  = 1 
   CONTENT_FORMAT_TEXT  = 2
@@ -68,6 +69,46 @@ class Caboose::Page < ActiveRecord::Base
   def self.index_page(site_id)
     return self.where(:site_id => site_id, :parent_id => -1).first
   end
+
+  def is_published
+    Caboose::Block.where(:page_id => self.id).where('status != ?','published').count == 0
+  end
+
+  def publish
+    Caboose::Block.where(:page_id => self.id).where('status = ? OR status = ?','edited','added').all.each do |b|
+      if b.new_value == 'EMPTY'
+        b.value = nil
+      elsif !b.new_value.blank?
+        b.value = b.new_value
+      end
+      if b.new_media_id == 0
+        b.media_id = nil
+      elsif !b.new_media_id.blank?
+        b.media_id = b.new_media_id
+      end
+      b.sort_order = b.new_sort_order if !b.new_sort_order.blank?
+      b.parent_id = b.new_parent_id if !b.new_parent_id.blank?
+      b.status = 'published'
+      b.new_value = nil
+      b.new_media_id = nil
+      b.new_sort_order = nil
+      b.new_parent_id = nil
+      b.save
+    end
+    deleted_blocks = Caboose::Block.where(:page_id => self.id, :status => 'deleted').pluck(:id)
+    dids = deleted_blocks.blank? ? 0 : deleted_blocks
+    Caboose::Block.where("id in (?) or parent_id in (?)",dids,dids).destroy_all
+    Caboose::Block.where(:page_id => self.id, :status => nil).update_all(:status => 'published')
+    self.status = 'published'
+    self.save
+  end
+
+  def revert
+    Caboose::Block.where(:page_id => self.id).where(:status => 'added').destroy_all
+    Caboose::Block.where(:page_id => self.id).update_all("status = 'published', new_value = null, new_media_id = null, new_sort_order = sort_order, new_parent_id = null")
+    self.status = 'published'
+    self.save
+  end
   
   def self.page_with_uri(host_with_port, uri, get_closest_parent = true)
 

data/app/models/caboose/post.rb

@@ -18,7 +18,8 @@ class Caboose::Post < ActiveRecord::Base
     :image_url   ,
     :published   ,
     :created_at  ,
-    :updated_at
+    :updated_at  ,
+    :status
     
   has_attached_file :image, 
     :path => ':caboose_prefixposts/:id_:style.:extension',
@@ -43,6 +44,46 @@ class Caboose::Post < ActiveRecord::Base
   def self.slug(str)    
     return str.downcase.gsub(' ', '-').gsub(/[^\w-]/, '')        
   end
+
+  def is_published
+    Caboose::Block.where(:post_id => self.id).where('status != ?','published').count == 0
+  end
+
+  def publish
+    Caboose::Block.where(:post_id => self.id).where('status = ? OR status = ?','edited','added').all.each do |b|
+      if b.new_value == 'EMPTY'
+        b.value = nil
+      elsif !b.new_value.blank?
+        b.value = b.new_value
+      end
+      if b.new_media_id == 0
+        b.media_id = nil
+      elsif !b.new_media_id.blank?
+        b.media_id = b.new_media_id
+      end
+      b.sort_order = b.new_sort_order if !b.new_sort_order.blank?
+      b.parent_id = b.new_parent_id if !b.new_parent_id.blank?
+      b.status = 'published'
+      b.new_value = nil
+      b.new_media_id = nil
+      b.new_sort_order = nil
+      b.new_parent_id = nil
+      b.save
+    end
+    deleted_blocks = Caboose::Block.where(:post_id => self.id, :status => 'deleted').pluck(:id)
+    dids = deleted_blocks.blank? ? 0 : deleted_blocks
+    Caboose::Block.where("id in (?) or parent_id in (?)",dids,dids).destroy_all
+    Caboose::Block.where(:post_id => self.id, :status => nil).update_all(:status => 'published')
+    self.status = 'published'
+    self.save
+  end
+
+  def revert
+    Caboose::Block.where(:post_id => self.id).where(:status => 'added').destroy_all
+    Caboose::Block.where(:post_id => self.id).update_all("status = 'published', new_value = null, new_media_id = null, new_sort_order = sort_order, new_parent_id = null")
+    self.status = 'published'
+    self.save
+  end
   
   def self.uri(post)
     str = "/posts/#x{post.created_at.strftime('%Y/%m/%d')}/#{post.slug}"