caboose-cms 0.9.228 → 0.9.229

data/app/controllers/caboose/login_logs_controller.rb

@@ -1,4 +1,3 @@
-
 module Caboose
   class LoginLogsController < ApplicationController
     layout 'caboose/admin'
@@ -9,7 +8,7 @@ module Caboose
 
     # @route GET /admin/login-logs/user/:userid
     def admin_index_for_user
-      return if !user_is_allowed_to 'view', 'loginlogs'
+      return if !user_is_allowed_to 'view', 'login_logs'
       @pager = self.login_logs_pager
       @edituser = Caboose::User.find(params[:userid]) if !params[:userid].blank?
       render :layout => 'caboose/admin'    
@@ -17,14 +16,14 @@ module Caboose
     
     # @route GET /admin/login-logs
     def admin_index
-      return if !user_is_allowed_to 'view', 'loginlogs'
+      return if !user_is_allowed_to 'view', 'login_logs'
       @pager = self.login_logs_pager
       render :layout => 'caboose/admin'    
     end
     
     # @route GET /admin/login-logs/json
     def admin_json
-      return if !user_is_allowed_to 'view', 'loginlogs'
+      return if !user_is_allowed_to 'view', 'login_logs'
       pager = self.login_logs_pager        
       render :json => {
         :pager => pager,
@@ -53,18 +52,17 @@ module Caboose
     
     # @route GET /admin/login-logs/:id/json
     def admin_json_single
-      return if !user_is_allowed_to 'view', 'loginlogs'
+      return if !user_is_allowed_to 'view', 'login_logs'
       login_log = LoginLog.find(params[:id])      
       render :json => login_log
     end
     
     # @route GET /admin/login-logs/:id
     def admin_edit
-      return if !user_is_allowed_to 'edit', 'loginlogs'
+      return if !user_is_allowed_to 'edit', 'login_logs'
       @login_log = LoginLog.find(params[:id])
 	    render :layout => 'caboose/admin'
     end
     
   end
 end
-

data/app/controllers/caboose/media_categories_controller.rb

@@ -61,6 +61,7 @@ module Caboose
       if !cat.save
         resp.error = cat.errors.first[1]
       else
+        Caboose::ChangeLog.create(:site_id => @site.id, :description => "Media Category: #{cat.name}", :is_field => true, :user_id => logged_in_user.id, :media_id => cat.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
         resp.new_id = cat.id
         resp.refresh = true
       end
@@ -98,8 +99,14 @@ module Caboose
     def admin_delete
       return unless user_is_allowed('mediacategories', 'delete')
       cat = MediaCategory.find(params[:id])
-      Media.where(:media_category_id => cat.id).destroy_all
-      cat.destroy            
+      if MediaCategory.top_category(@site.id).id != cat.id
+        Media.where(:media_category_id => cat.id).update_all(:deleted => true)
+        cat.parent_id = 0
+        cat.save
+        if @site.use_change_logs
+          Caboose::ChangeLog.create(:site_id => @site.id, :description => "Media Category: #{cat.name}", :is_field => true, :user_id => logged_in_user.id, :media_id => cat.id, :timestamp => DateTime.now, :action => 'deleted') if @site.use_change_logs
+        end
+      end
       render :json => { :success => true }
     end
     
@@ -113,6 +120,13 @@ module Caboose
       ids.each do |id|
         m = Media.where(:id => id).first
         next if m.nil?
+        if @site.use_change_logs
+          mc1 = Caboose::MediaCategory.where(:id => m.media_category_id).first
+          mc2 = Caboose::MediaCategory.where(:id => media_category_id).first
+          ov = mc1 ? mc1.name : "N/A"
+          nv = mc2 ? mc2.name : "N/A"
+          Caboose::ChangeLog.create(:site_id => @site.id, :description => "Category", :user_id => logged_in_user.id, :media_id => m.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => nv)
+        end
         m.update_attribute(:media_category_id, media_category_id)
         p = Product.where(:media_category_id => media_category_id).last
         if p

data/app/controllers/caboose/media_controller.rb

@@ -72,8 +72,8 @@ module Caboose
     # @route GET /admin/media/json
     def admin_json
       return if !user_is_allowed('media', 'view')
-      render :json => false and return if @site.nil?
-      arr = Media.where(:media_category_id => params[:media_category_id]).reorder(:sort_order).all
+      render :json => false and return if @site.nil? || params[:media_category_id].blank?
+      arr = Media.where(:media_category_id => params[:media_category_id], :deleted => false).reorder(:sort_order).all
       render :json => arr.collect{ |m| m.api_hash }                  
     end
     
@@ -131,7 +131,7 @@ module Caboose
           when 'sort_order'   then m.sort_order   = value
           when 'image_url'    then
             m.processed = false
-            m.delay(:queue => 'caboose_media', :priority => 2).download_image_from_url(value)
+            m.delay(:queue => 'general', :priority => 2).download_image_from_url(value)
         end
       end
       
@@ -163,12 +163,14 @@ module Caboose
     # @route DELETE /admin/media/:id
     def admin_delete
       return unless user_is_allowed('media', 'delete')
-      
       model_ids = params[:id] == 'bulk' ? params[:ids] : [params[:id]]             
       model_ids.each do |media_id|
-        ProductImage.where(:media_id => media_id).destroy_all
-        Media.where(:id => media_id).destroy_all
-      end                  
+        if @site.use_change_logs
+          on = Media.title_for_id(media_id)
+          Caboose::ChangeLog.create(:site_id => @site.id, :description => on, :user_id => logged_in_user.id, :media_id => media_id, :timestamp => DateTime.now, :action => 'deleted')
+        end
+        Media.where(:id => media_id).update_all(:deleted => true)
+      end
       render :json => { :success => true }
     end
     
@@ -185,11 +187,12 @@ module Caboose
       else
         file_content_type = file_type
       end
-      m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
-      if m.nil?
+      #m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name, :deleted => false).first
+      #if m.nil?
         max = Media.where(:media_category_id => media_category_id).maximum(:sort_order)
-        m = Media.create(:media_category_id => media_category_id, :description => desc, :sort_order => (max ? (max + 1) : 0), :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false)
-      end
+        m = Media.create(:media_category_id => media_category_id, :description => desc, :sort_order => (max ? (max + 1) : 0), :original_name => original_name, :name => name, :image_content_type => image_content_type, :file_content_type => file_content_type, :processed => false, :deleted => false)
+        Caboose::ChangeLog.create(:site_id => @site.id, :description => original_name, :user_id => logged_in_user.id, :media_id => m.id, :timestamp => DateTime.now, :action => 'uploaded') if @site.use_change_logs
+      #end
       p = Product.where(:media_category_id => media_category_id).last
       if p
         pi = ProductImage.create(:product_id => p.id, :media_id => m.id)

data/app/controllers/caboose/pages_controller.rb

@@ -5,7 +5,8 @@ module Caboose
     helper :application
     
     def before_action
-      @page = Page.page_with_uri(request.host_with_port, '/admin')      
+      # removing temporarily - looks like not needed:
+      #@page = Page.page_with_uri(request.host_with_port, '/admin')      
     end
     
     # @route GET /pages/:id/redirect
@@ -137,25 +138,48 @@ module Caboose
       #header("Content-Disposition: inline filename=\"$asset->filename\"")
 
     end
+
+    # @route GET /api/sitemap
+    def api_sitemap
+      siteid = params[:site_id].blank? ? @site.id : params[:site_id]
+      render :json => Caboose::Page.select([:id, :title, :menu_title, :parent_id, :redirect_url, :uri, :sort_order]).where(:site_id => siteid, :hide => false).order(:id).all
+    end
     
     #===========================================================================
     # Admin actions
     #===========================================================================
 
-    # @route GET /admin/pages/:id/publish
+    # @route PUT /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"
+      resp = Caboose::StdClass.new
+      resp.success = false
+      @page = Page.find(params[:id])
+      condition = @page && @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'))))
+      render :json => resp and return unless condition
+      resp.success = true
+      @page.delay(:queue => 'caching', :priority => 2).publish(logged_in_user.id)
+      render :json => resp
+    end
+
+    # @route GET /admin/pages/:id/status
+    def admin_status
+      resp = Caboose::StdClass.new
+      resp.status = 'pending'
+      @page = Page.find(params[:id])
+      if @page && @page.is_published
+        resp.status = 'published'
+      end
+      render :json => resp
     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"
+      @page = Page.find(params[:id])
+      condition = @page && @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
+      @page.revert
+      redirect_to "/admin/pages/#{@page.id}/content"
     end
     
     # @route GET /admin/pages
@@ -355,6 +379,35 @@ module Caboose
         render :layout => 'caboose/admin'
       end
     end
+
+    # @route GET /api/page_:id
+    def compiled_asset
+      @page = Page.find(params[:id])
+      respond_to do |format|
+        format.css { render :layout => 'caboose/css', :content_type => "text/css" }
+        format.js { render :layout => 'caboose/js', :content_type => "text/javascript" }
+      end
+    end
+
+    # @route GET /api/pages/:id/refresh-cache
+    def refresh_cached_blocks
+      render :json => false and return unless (user_is_allowed('pages', 'edit') && @site.use_caching)
+      resp = Caboose::StdClass.new
+      @page = Page.find(params[:id])
+      content = @page.block.child('content')
+      home_page = Caboose::Page.index_page(@site.id)
+      footer = home_page.block.child('footer')
+      block_ids = Caboose::Block.where("parent_id = ? OR parent_id = ?", content.id, footer.id).pluck(:id)
+      @page.update_cached_blocks(block_ids)
+      @page.delay(:queue => 'caching', :priority => 8).update_css_file
+      @page.delay(:queue => 'caching', :priority => 8).update_js_file
+      if home_page && @page.id == home_page.id
+        @site.delay(:queue => 'caching', :priority => 8).update_footer_css_file
+        @site.delay(:queue => 'caching', :priority => 8).update_footer_js_file
+      end
+      resp.success = true
+      render :json => resp
+    end
     
     # @route GET /admin/pages/:id/js
     def admin_edit_js
@@ -432,7 +485,7 @@ module Caboose
       elsif site_id.nil?   then resp.error = "Invalid site"
       elsif parent_id.nil? then resp.error = "Invalid parent"
       else
-        resp.new_id = Rails.env.production? ? p.delay(:priority => 20).duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id) : p.duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id)
+        resp.new_id = Rails.env.production? ? p.delay(:queue => 'general', :priority => 20).duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id, logged_in_user.id) : p.duplicate(site_id, parent_id, duplicate_children, block_type_id, child_block_type_id, logged_in_user.id)
         resp.success = true
       end
       
@@ -468,12 +521,24 @@ module Caboose
       end
     end
 
+    # @route GET /admin/pages/:id/logs
+    def admin_change_logs
+      return unless user_is_allowed('logs', 'view')
+      @page = Page.find(params[:id])  
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
+        redirect_to '/admin/pages'
+      else
+        @logs = ChangeLog.where(:page_id => @page.id).where('(is_field is false and (action = ? OR action = ?)) OR (action != ? and action != ?)','added','deleted','added','deleted').order('timestamp desc, id desc').limit(500)
+        render :layout => 'caboose/admin'
+      end
+    end
+
     # @route GET /admin/pages/:id
     def admin_edit_general
       return if !user_is_allowed('pages', 'edit')
       #return if !Page.is_allowed(logged_in_user, params[:id], 'edit')            
       @page = Page.find(params[:id])
-      @can_edit_home = user_is_allowed_to('edit', Caboose::Page.index_page(@site.id))
+      @can_edit_home = logged_in_user.is_allowed(Caboose::Page.index_page(@site.id), 'edit')
       if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
@@ -496,11 +561,12 @@ module Caboose
 
       parent = Caboose::Page.find(parent_id)
 
+      allowed_to_edit = Page.page_ids_with_permission(logged_in_user, 'edit')
+      allowed_to_edit = allowed_to_edit.count > 0 ? allowed_to_edit.include?(parent.id) : false
+
       if title.blank?
         resp.error = "Page Title is required."
-      elsif (!logged_in_user.is_allowed('all', 'all') && 
-        !Page.page_ids_with_permission(logged_in_user, 'edit'   ).include?(parent_id) &&
-        !Page.page_ids_with_permission(logged_in_user, 'approve').include?(parent_id))
+      elsif (!logged_in_user.is_allowed('all', 'all') && !allowed_to_edit)
         resp.error = "You don't have permission to add a page there."
       end
       if (!resp.error.nil?)
@@ -520,7 +586,6 @@ module Caboose
         page.title = title
         page.parent_id = parent_id      
         page.hide = true
-        page.content_format = Caboose::Page::CONTENT_FORMAT_HTML
         page.save
         i = 0
         begin 
@@ -538,13 +603,14 @@ module Caboose
         Caboose::Page.update_authorized_for_action(page.id, 'view', viewers)
         Caboose::Page.update_authorized_for_action(page.id, 'edit', editors)
         resp.redirect = "/admin/pages/#{page.id}/content"
+        Caboose::ChangeLog.create(:site_id => @site.id, :description => page.title, :user_id => logged_in_user.id, :page_id => page.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
 
       # Copy from an existing page
       elsif !params[:copy_from_id].blank? && params[:use_copy] == 'yes'
         source = Caboose::Page.find(params[:copy_from_id])
         if source
           Caboose.log("copying from source page: #{source.id}")
-          new_page = source.duplicate(@site.id, parent_id, false, layout_id, nil)
+          new_page = source.duplicate(@site.id, parent_id, false, layout_id, nil, logged_in_user.id)
           new_page.title = params[:title]
           new_page.hide = true
           i = 0
@@ -560,6 +626,7 @@ module Caboose
           Caboose::Page.update_authorized_for_action(new_page.id, 'view', viewers)
           Caboose::Page.update_authorized_for_action(new_page.id, 'edit', editors)
           resp.redirect = "/admin/pages/#{new_page.id}/content"
+          Caboose::ChangeLog.create(:site_id => @site.id, :description => new_page.title, :user_id => logged_in_user.id, :page_id => new_page.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
         else
           resp.redirect = "/admin/pages/new"
         end
@@ -568,7 +635,7 @@ module Caboose
       elsif !params[:template_id].blank? && params[:use_template] == 'yes'
         template = Caboose::PageTemplate.find(params[:template_id])
         if template && template.page
-          new_page = template.page.duplicate(@site.id, parent_id, false, layout_id, nil)
+          new_page = template.page.duplicate(@site.id, parent_id, false, layout_id, nil, logged_in_user.id)
           new_page.title = params[:title]
           new_page.hide = true
           i = 0
@@ -584,6 +651,7 @@ module Caboose
           Caboose::Page.update_authorized_for_action(new_page.id, 'view', viewers)
           Caboose::Page.update_authorized_for_action(new_page.id, 'edit', editors)
           resp.redirect = "/admin/pages/#{new_page.id}/content"
+          Caboose::ChangeLog.create(:site_id => @site.id, :description => new_page.title, :user_id => logged_in_user.id, :page_id => new_page.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
         else
           resp.redirect = "/admin/pages/new"
         end
@@ -602,6 +670,7 @@ module Caboose
       save = true
       user = logged_in_user
       params.each do |name, value|
+        old_value = page[name]
         case name
         when 'parent_id'
           value = value.to_i
@@ -627,30 +696,10 @@ module Caboose
         when 'custom_css', 'custom_css_files', 'custom_js', 'custom_js_files'
           value.strip!
           page[name.to_sym] = value
-
-        when 'title', 'menu_title', 'hide', 'layout', 'redirect_url',
+        
+        when 'title', 'menu_title', 'hide', 'redirect_url',
           'seo_title', 'meta_keywords', 'meta_description', 'fb_description', 'gp_description', 'canonical_url'
           page[name.to_sym] = value
-
-        when 'linked_resources'
-          result = []
-          value.each_line do |line|
-            line.chomp!
-            line.strip!
-            next if line.empty?
-
-            if !(line.ends_with('.js') || line.ends_with('.css'))
-              resp.error = "Resource '#{line}' has an unsupported file type ('#{comps.last}')."
-              save = false
-            end
-
-            result << line
-          end
-          page.linked_resources = result.join("\n")
-          
-        when 'content_format'
-          page.content_format = value
-          resp.attributes['content_format'] = { 'text' => value }
           
         when 'meta_robots'
           arr = value.split(',').collect { |v| v.strip }
@@ -695,8 +744,8 @@ module Caboose
           Page.update_authorized_for_action(page.id, 'view', value)
         when 'editors'
           Page.update_authorized_for_action(page.id, 'edit', value)
-        when 'approvers'
-          Page.update_authorized_for_action(page.id, 'approve', value)
+        # when 'approvers'
+        #   Page.update_authorized_for_action(page.id, 'approve', value)
         when 'tags'
           current_tags = page.page_tags.collect{ |t| t.tag }
           new_tags = value.split(',').collect{ |v| v.strip.downcase }.reject{ |t| t.nil? || t.strip.length == 0 }          
@@ -707,10 +756,22 @@ module Caboose
           # Add any new tags not in current_tags
           new_tags.each{ |t| PageTag.create(:page_id => page.id, :tag => t) if !current_tags.include?(t) }        
         end
-        
+
+        if @site.use_change_logs && !['id','action','controller'].include?(name)
+          ov = name == 'parent_id' ? Caboose::Page.title_for_id(old_value) : old_value
+          nv = name == 'parent_id' ? Caboose::Page.title_for_id(value) : value
+          ov = ['hide','custom_sort_children'].include?(name) ? (ov ? 'yes' : 'no') : ov
+          nv = ['hide','custom_sort_children'].include?(name) ? ( ['1',1,true,'true'].include?(nv) ? 'yes' : 'no') : nv
+          cl = Caboose::ChangeLog.create(:site_id => @site.id, :description => "Page #{name.titleize}", :user_id => user.id, :page_id => page.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => nv)
+        end
+
       end
     
       resp.success = save && page.save
+
+      page.delay(:queue => 'caching', :priority => 8).update_css_file if params[:custom_css] && @site.use_caching
+      page.delay(:queue => 'caching', :priority => 8).update_js_file if params[:custom_js] && @site.use_caching
+
       render json: resp
     end
     
@@ -718,6 +779,7 @@ module Caboose
     def admin_delete
       return unless user_is_allowed('pages', 'delete')
       p = Page.find(params[:id])
+      Caboose::ChangeLog.create(:site_id => @site.id, :description => p.title, :user_id => logged_in_user.id, :page_id => p.id, :timestamp => DateTime.now, :action => 'deleted') if @site.use_change_logs
       p.destroy
       resp = StdClass.new({
         'redirect' => '/admin/pages'

data/app/controllers/caboose/posts_controller.rb

@@ -73,12 +73,38 @@ module Caboose
       render :layout => 'caboose/admin'
     end
 
-    # @route GET /admin/posts/:id/publish
+    # @route GET /admin/posts/:id/logs
+    def admin_change_logs
+      return unless user_is_allowed('logs', 'view')
+      @post = Post.find(params[:id])  
+      if @post.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
+        redirect_to '/admin/posts'
+      else
+        @logs = ChangeLog.where(:post_id => @post.id).where('(is_field is false and (action = ? OR action = ?)) OR (action != ? and action != ?)','added','deleted','added','deleted').order('timestamp desc, id desc').limit(500)
+        render :layout => 'caboose/admin'
+      end
+    end
+
+    # @route PUT /admin/posts/:id/publish
     def admin_publish
-      return unless user_is_allowed('posts', 'edit')
+      resp = Caboose::StdClass.new
+      resp.success = false
+      render :json => resp and return unless user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
-      post.publish
-      redirect_to "/admin/posts/#{post.id}/content"
+      resp.success = true
+      post.delay(:queue => 'caching', :priority => 5).publish(logged_in_user.id)
+      render :json => resp
+    end
+
+    # @route GET /admin/posts/:id/status
+    def admin_status
+      resp = Caboose::StdClass.new
+      resp.status = 'pending'
+      post = get_edit_post(params[:id], @site.id)
+      if post && post.is_published
+        resp.status = 'published'
+      end
+      render :json => resp
     end
 
     # @route GET /admin/posts/:id/revert
@@ -170,7 +196,9 @@ module Caboose
       resp = Caboose::StdClass.new({'attributes' => {}})
       post = get_edit_post(params[:id], @site.id)
       save = true
-      params.each do |name, value|    
+      user = logged_in_user
+      params.each do |name, value|
+        old_value = post[name]
         case name                      
           when 'site_id'    then post.site_id    = value.to_i
           when 'slug'       then post.set_slug_and_uri(value)                        
@@ -185,6 +213,13 @@ module Caboose
           when 'created_at' then post.created_at = DateTime.strptime(value,'%m/%d/%Y')
           when 'updated_at' then post.updated_at = DateTime.parse(value)
         end
+        if @site.use_change_logs && !['id','action','controller'].include?(name)
+          ov = old_value
+          nv = value
+          ov = ['published'].include?(name) ? (ov ? 'yes' : 'no') : ov
+          nv = ['published'].include?(name) ? ( ['1',1,true,'true'].include?(nv) ? 'yes' : 'no') : nv
+          cl = Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post #{name.titleize}", :user_id => user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => nv)
+        end
       end
       resp.success = save && post.save      
       render :json => resp
@@ -192,20 +227,25 @@ module Caboose
     
     # @route POST /admin/posts/:id/image
     def admin_update_image
-      return if !user_is_allowed('posts', 'edit')  
+      return if !user_is_allowed('posts', 'edit')
+      user = logged_in_user
       resp = Caboose::StdClass.new
       post = get_edit_post(params[:id], @site.id)
+      ov = post.image_file_name
       post.image = params[:image]            
       resp.success = post.save
       resp.attributes = { 'image' => { 'value' => post.image.url(:thumb) }}
+      Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Image", :user_id => user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'edited', :old_value => ov, :new_value => post.image_file_name) if @site.use_change_logs
       render :text => resp.to_json
     end
 
     # @route POST /admin/posts/:id/remove-image
     def admin_remove_image
       return unless user_is_allowed("posts", 'edit')
-      resp = Caboose::StdClass.new   
+      resp = Caboose::StdClass.new
+      user = logged_in_user
       b = Post.find(params[:id])
+      Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Image", :user_id => user.id, :post_id => b.id, :timestamp => DateTime.now, :action => 'edited', :old_value => b.image_file_name, :new_value => 'None') if @site.use_change_logs
       b.image_file_name = nil
       b.image_file_size = nil
       b.image_content_type = nil
@@ -241,6 +281,7 @@ module Caboose
         bt = BlockType.where(:id => @site.default_layout_id).first
         Block.create(:post_id => post.id, :block_type_id => bt.id, :name => bt.name) if post && bt
         resp.redirect = "/admin/posts/#{post.id}"
+        Caboose::ChangeLog.create(:site_id => @site.id, :description => post.title, :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'created') if @site.use_change_logs
       end
       render :json => resp
     end
@@ -250,8 +291,10 @@ module Caboose
       return if !user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
       cat_id = params[:post_category_id]
+      cat = PostCategory.where(:id => cat_id).first
       if post && !PostCategoryMembership.exists?(:post_id => post.id, :post_category_id => cat_id)
         PostCategoryMembership.create(:post_id => post.id, :post_category_id => cat_id)
+        Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Category", :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => "added", :new_value => (cat ? cat.name : nil)) if @site.use_change_logs
       end
       render :json => true      
     end
@@ -261,8 +304,10 @@ module Caboose
       return if !user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
       cat_id = params[:post_category_id]
+      cat = PostCategory.where(:id => cat_id).first
       if post && PostCategoryMembership.exists?(:post_id => post.id, :post_category_id => cat_id)
         PostCategoryMembership.where(:post_id => post.id, :post_category_id => cat_id).destroy_all
+        Caboose::ChangeLog.create(:site_id => @site.id, :description => "Post Category", :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => "deleted", :old_value => (cat ? cat.name : nil)) if @site.use_change_logs
       end
       render :json => true      
     end
@@ -272,6 +317,7 @@ module Caboose
       return if !user_is_allowed('posts', 'edit')
       post = get_edit_post(params[:id], @site.id)
       PostCategoryMembership.where(:post_id => post.id).destroy_all if post
+      Caboose::ChangeLog.create(:site_id => @site.id, :description => post.title, :user_id => logged_in_user.id, :post_id => post.id, :timestamp => DateTime.now, :action => 'deleted') if post && @site.use_change_logs
       Post.where(:id => post.id).destroy_all if post
       render :json => { 'redirect' => '/admin/posts' }      
     end