caboose-cms 0.9.134 → 0.9.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcfbf246d2536f0c9e4403a909f7555bc07c6cd7
-  data.tar.gz: 9c92cffdf2508586d117a4c9e7d3030739c81f77
+  metadata.gz: 2390d0194741e14fcbe3c793fe4e1d3efce280e3
+  data.tar.gz: 381c777c54b1c76192d6e68ab14857784d3931ee
 SHA512:
-  metadata.gz: ef97678358c46a955e4e1fe41dee59189ec855db8d84be5b3d56b32893a3515988583358c7d18a18e063087a3538c4abfd6fdb1b2e9e46ddbda7d76c2a569e6f
-  data.tar.gz: cbb48655938c647fbc0495d64ef73ef95e1570448d3359523c0753222cb22279b1ae30c3baca83516b73ac1f96fb3a7b42be776f4c82a56b7f7ce032549c4064
+  metadata.gz: 68afb4b1b1a2eb61c3d571047f8c882bde110b014d4509f084560650081975706966f08c4d5dbff94af9d58a4956a5526acdcb7d6b90b984ef721c41599e5fbe
+  data.tar.gz: 5d4df4df76087c9c0b77a36a71a54bdeb677e0880afd9dc53846975a2ea32c394efc48ec8edcb29441129d1c3d62239a8c35a032f1297320292d9fcf54e7f370

data/app/assets/javascripts/caboose/block_content_controller_dragdrop.js

@@ -53,16 +53,24 @@ BlockContentController.prototype = {
           var target_id = $(b).data('rtid');
      //     var block_id = $(b).attr('id').replace('block_','');
           var editor = CKEDITOR.inline( $(b).attr('id') );
+
           editor.on('change', function(ev) {
             that.is_modified();
+            $(b).css('background-color','#ffffd0').css('color','black');
+          });
+
+          editor.on('blur', function(ev) {
             var html = $(b).html();
             $.ajax({
               url: that.base_url() + '/' + target_id + '/value',
               type: 'put',
               data: { value: html },
-              success: function(resp) { }
+              success: function(resp) { 
+                $(b).css('background-color','').css('color','');
+              }
             });
           });
+
         }
       });
     });

data/app/controllers/caboose/pages_controller.rb

@@ -82,7 +82,6 @@ module Caboose
       @editmode = !params['edit'].nil? && user.is_allowed('pages', 'edit') ? true : false
    #   @crumb_trail = Caboose::Page.crumb_trail(@page)
    #   @subnav = Caboose::Page.subnav(@page, session['use_redirect_urls'], @user)
-
       #@subnav.links = @tasks.collect {|href, task| {'href' => href, 'text' => task, 'is_current' => uri == href}}
   
     end
@@ -221,9 +220,8 @@ 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')
+      Caboose::Block.where(:page_id => @page.id, :new_sort_order => nil).update_all('new_sort_order = sort_order') if @page && !@page.id.nil?
+      Caboose::Block.where(:page_id => @page.id, :status => nil).update_all(:status => 'published') if @page && !@page.id.nil?
       @editing = true
       @preview = false
     end

data/app/controllers/caboose/posts_controller.rb

@@ -105,8 +105,8 @@ 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')
+      Caboose::Block.where(:post_id => @post.id, :new_sort_order => nil).update_all('new_sort_order = sort_order') if @post && !@post.id.nil?
+      Caboose::Block.where(:post_id => @post.id, :status => nil).update_all(:status => 'published') if @post && !@post.id.nil?
       @editing = true
       @preview = false
     end

data/app/models/caboose/page.rb

@@ -71,43 +71,47 @@ class Caboose::Page < ActiveRecord::Base
   end
 
   def is_published
-    Caboose::Block.where(:page_id => self.id).where('status != ?','published').count == 0
+    Caboose::Block.where(:page_id => self.id).where('status != ?','published').count == 0 if !self.id.nil?
   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
+    if !self.id.nil?
+      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
-      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
+      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
-    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
+    if !self.id.nil?
+      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
   end
   
   def self.page_with_uri(host_with_port, uri, get_closest_parent = true)

data/app/models/caboose/post.rb

@@ -46,43 +46,47 @@ class Caboose::Post < ActiveRecord::Base
   end
 
   def is_published
-    Caboose::Block.where(:post_id => self.id).where('status != ?','published').count == 0
+    Caboose::Block.where(:post_id => self.id).where('status != ?','published').count == 0 if !self.id.nil?
   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
+    if !self.id.nil?
+      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
-      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
+      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
-    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
+    if !self.id.nil?
+      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
   end
   
   def self.uri(post)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.134'
+  VERSION = '0.9.135'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.134
+  version: 0.9.135
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg