caboose-cms 0.4.17 → 0.4.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWUxNzk3MmI4MzE5ZWUxNTZiM2ZmMDMzYzViNjAzNWU5NDk0YmU0Yg==
+    NTc1OTFkZGQzMGQ3YTAyMGRkNGM2NjgzOGJjMDc4ZDZiOWEyZjE2MA==
   data.tar.gz: !binary |-
-    NTA2NDcwOWQ2Njc0NzM5Mzg2NjNjZjdjN2ZlMTY0NmY3MGQyZTIxZg==
+    NWYwYzBmMzhhZTlkMzcxMzdkMGZjNDM5ZjI2MzdhZTUwNDRjZDMyOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDgwYTU1N2M1MzE1NGFiZWZmNTMxNGY3MzQwODY5MGE0NzI1MzI5ODQwNDc5
-    YjljNzM3Y2JjMTAwMDIwMDBmNTA5ZjA0ZDUzNzdkMzBmNzk4ZWJiYjJjNDRl
-    M2E3NjZlYjA3NWMyZGM0YWM0MWIxM2IxZWU2MDAxNWI3OTMyMWU=
+    NGMxMGFjZjMyNDIwZGE1YWMzNGI3MTNiN2MyOWI2MzkzZTM2MDk4NWEwYWYz
+    MWUwZGU1ZGRlZDRiYzY4YzZkYWVhMWU4NjkyYzcyYmYwNjE2OTIyZGYyMjhm
+    MjcyNzQ2NTNjNGM4MTI5OTI1YjIyMDg1ZjM4NDk1OWM1MWNiM2I=
   data.tar.gz: !binary |-
-    NTA3NzU5MTdjZTc2ZTNkMTgxZGIxZjg0NjhmOGM4NzhjNjdmNThmOWIxYjMw
-    NzE0ZjRmYmIwZDhhZWI5ZTM2YmFmYjZhOWU4YTgwZDNmYjc4NzNjMjJjZmM4
-    ZGRhZGQxMWJjN2VmNzFmMGM5MGEzNDViNjkyMWRhZWUwMGNjMjE=
+    MjMzODI0Yzc4MTBlODZmMWNkZTNkYTFjODIxNGI5MDc5NjE4MDM0MDUwN2M1
+    MWIyZWExZGExOTM5NzllMmM2YWMwNGM5Y2I1MDBkMDIwMjk2YWZhZGEyZDA4
+    YzE4YWIyMjIyOTY0NGU4ZDk4NjdjNGViOWJjNzU4YmEwYTFjZmI=

data/app/assets/javascripts/caboose/model/bound_richtext.js

@@ -96,7 +96,7 @@ BoundRichText = BoundControl.extend({
   },
   
   cancel: function() {    
-    if (this.attribute.before_cancel) this.attribute.before_cancel();            
+    if (this.attribute.before_cancel) this.attribute.before_cancel();
     this.attribute.value = this.attribute.value_clean;
     $('#'+this.el).val(this.attribute.value);
     $('#'+this.el).removeClass('mb_dirty');

data/app/controllers/caboose/blocks_controller.rb

@@ -101,18 +101,30 @@ module Caboose
     def admin_render_second_level
       return unless user_is_allowed('pages', 'edit')
       p = Page.find(params[:page_id])
+      @p = p
       blocks = p.block.children.collect do |b|
-        {          
+        {           
           :id => b.id,
           :block_type_id => b.block_type.id,
           :sort_order => b.sort_order,
           :html => b.render(b, {
-            :empty_text => params[:empty_text],
-            :editing => true
+            :view => nil,
+            :controller_view_content => nil,
+            :modal => false,
+            :editing => true,
+            :empty_text => params[:empty_text],            
+            :css => '|CABOOSE_CSS|',
+            :js => '|CABOOSE_JAVASCRIPT|',
+            :csrf_meta_tags => '|CABOOSE_CSRF|'
           })
         }
       end
       render :json => blocks
+      #render :layout => false
+      
+      #respond_to do |format|        
+      #  format.json
+      #end
     end
     
     # GET /admin/pages/:page_id/blocks/:id/edit

data/app/models/caboose/block.rb

@@ -115,6 +115,7 @@ class Caboose::Block < ActiveRecord::Base
     options2[:block] = block
 
     view = options2[:view]
+    view = ActionView::Base.new(ActionController::Base.view_paths) if view.nil?    
     if block.block_type.use_render_function && block.block_type.render_function            
       #str = block.render_from_function(options2)
       
@@ -127,11 +128,10 @@ class Caboose::Block < ActiveRecord::Base
       str = view.render(:partial => "caboose/blocks/render_function", :locals => options2)
     else
       #view = ActionView::Base.new(ActionController::Base.view_paths, options2, )      
-      #view = ActionView::Base.new(options2[:view].view_renderer, {}, options2[:view].controller)
-      view = options2[:view]
+      #view = ActionView::Base.new(options2[:view].view_renderer, {}, options2[:view].controller)      
       begin        
         full_name = block.full_name
-        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0        
+        full_name = "lksdjflskfjslkfjlskdfjlkjsdf" if full_name.nil? || full_name.length == 0                
         str = view.render(:partial => "caboose/blocks/#{full_name}", :locals => options2)        
       rescue ActionView::MissingTemplate
         begin          

data/app/views/caboose/blocks/admin_render_second_level.json.erb

@@ -0,0 +1,16 @@
+<%
+blocks = @p.block.children.collect do |b|
+  {               
+    :id => b.id,
+    :block_type_id => b.block_type.id,
+    :sort_order => b.sort_order,
+    :html => b.render(b, { 
+      :view => self,
+      #:controller_view_content => yield,
+      :modal => false,
+      :empty_text => @empty_text,
+      :editing => true      
+    })
+  }
+end
+%><%= raw blocks.to_json %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.17'
+  VERSION = '0.4.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
 platform: ruby
 authors:
 - William Barry
@@ -345,6 +345,7 @@ files:
 - app/views/caboose/blocks/admin_edit_h6.html.erb
 - app/views/caboose/blocks/admin_edit_richtext.html.erb
 - app/views/caboose/blocks/admin_new.html.erb
+- app/views/caboose/blocks/admin_render_second_level.json.erb
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/login/forgot_password_form.html.erb