caboose-cms 0.8.56 → 0.8.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8aa462e50b81de8d5a19890e06e9718f2f9367d
-  data.tar.gz: c4ef0bfb833d42461bfa368bbb4b878325e0f5d9
+  metadata.gz: 46cad8ef370ab797b7f36acf01536f50c4194d33
+  data.tar.gz: 8f8db6b566034b216a86337aacf9aab8fdec23d7
 SHA512:
-  metadata.gz: 9846f063fd1665761671434ff3dc532862b3ce53f731f87da4d3adda37ae854c82e5bfc6258d7b5cc3746695366c1b86059336909b1de1dbd7360b1c1986a9d7
-  data.tar.gz: dd87b9498fcf43e04ac1c365c0d8a8989b88f5bf3c5aee720313c2350f9d374fb293aaad1cfc3e7e920f2416a46c9c124680188297ba207b74da3cc023c895a4
+  metadata.gz: f6b53ec696e54189d76d3726f100e194d86a5161b7c840f6a04a18d729814745ca7bc81381aacd2d1760962beb26eaf93e62d12684a4cb0aeb4e042dc46276a7
+  data.tar.gz: 10473972752dd1cd0f8aa7646aeff8501c72970ae4ca975613a8b689c5130b8cbe76592caecf289cc6c60d0bf45c8139cf060e926cc88454e94fb29f8742e47e

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

@@ -260,8 +260,9 @@ PageContentController.prototype = {
         );
       }
     }
-            
-    $('#block_' + b.id).attr('onclick','').unbind('click');    
+    
+    $('#block_' + b.id + ' *').attr('onclick', '').unbind('click');
+    $('#block_' + b.id).attr('onclick','').unbind('click');
     $('#block_' + b.id).click(function(e) {
       e.preventDefault();
       e.stopPropagation();

data/app/assets/javascripts/caboose/block_modal_controllers/block_modal_controller.js

@@ -115,7 +115,7 @@ var BlockModalController = ModalController.extend({
       }
     }
     $('#modal_content').replaceWith(div);
-    that.render_blocks();
+    that.render_child_blocks();
     that.autosize();
   },
   
@@ -193,16 +193,16 @@ var BlockModalController = ModalController.extend({
   Block Rendering
   *****************************************************************************/
 
-  render_blocks: function()
+  render_child_blocks: function()
   {
     var that = this;    
     if (that.block.block_type.field_type != 'block' && that.block.children.length == 0)
       return;
     
-    $.each(that.block.children, function(i, b) { that.render_block(b); });        
+    $.each(that.block.children, function(i, b) { that.render_child_block(b); });        
   },
   
-  render_block: function(b)
+  render_child_block: function(b)
   {
     var that = this;    
     if (that.complex_field_types.indexOf(b.block_type.field_type) > -1)

data/app/controllers/caboose/media_controller.rb

@@ -73,16 +73,18 @@ module Caboose
     def admin_json
       return if !user_is_allowed('media', 'view')
       render :json => false and return if @site.nil?
-      #id = params[:media_category_id]        
-      #cat = id ? MediaCategory.find(id) : MediaCategory.top_category(@site.id)      
-      #render :json => cat.api_hash
-      
+            
       arr = Media.where(:media_category_id => params[:media_category_id]).reorder(:sort_order).all
-      render :json => arr.collect{ |m| m.api_hash }
-      
-      #cat = id ? MediaCategory.find(id) : MediaCategory.top_category(@site.id)      
-      #render :json => cat.api_hash
-      
+      render :json => arr.collect{ |m| m.api_hash }                  
+    end
+    
+    # @route GET /admin/media/:id/json
+    def admin_json_single
+      return if !user_is_allowed('media', 'view')
+      render :json => false and return if @site.nil?
+            
+      m = Media.where(:id => params[:id]).first
+      render :json => m.api_hash      
     end
     
     # @route GET /admin/media/last-upload-processed

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.56'
+  VERSION = '0.8.57'
 end

metadata

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