caboose-cms 0.9.68 → 0.9.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3740d98e50a2e6558a49bca0525a37fcf544733c
-  data.tar.gz: bbf0b080b4fc7283ad1d1cea14cd2a67e8f8d975
+  metadata.gz: 831370d428d4a0786206a9f5b8e54526ff3f9c39
+  data.tar.gz: a01277ddc1bb65442d2ca545bb05fbfbf7e3abcf
 SHA512:
-  metadata.gz: c66ee2560897a8063e4f105867c42d53e5350619a227c19b85442914288d70b0eb7136260cdf90f0524ab97e5ccb5a2641a1a427a39b93a6d660bfc5d4a44eab
-  data.tar.gz: 7cca0d9adc8d03e3aa197ba71c86ca2b37346887a65285f6aa7dcdb9e6fc37d0f22bbcb6336457a3c496cb73df3064332fba94832f2413a000b8f0f425629093
+  metadata.gz: a58535527e87f529273d0899fa31a3723190cf6cbc640eb5b4edf9371a5b3dd45ef529ee7c7c999b65954ba8d0cfc4e7100d981187fe09708c62e2504cf35bc2
+  data.tar.gz: 4b2f1c9ff9053eb199c3da28fa9a5346c499b7d395ce61cffbdc016f22be88da4f9af0d7d1f51aaeab9d5e71b8aab0f779a8feac74909e55c5222f5e692d7522

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

@@ -140,7 +140,6 @@ BlockContentController.prototype = {
       $("#caboose-loading").fadeOut();
   },
 
-
   move_block: function(block_id, parent_id, before_block_id, after_block_id) {
     var that = this;
     var block_id = block_id.replace('block_','');
@@ -155,9 +154,11 @@ BlockContentController.prototype = {
       else if (after_block_id)
         $('#block_' + after_block_id).after(el);
       else if (parent_id) {
-        if ( $('#block_' + parent_id).children('.content_body').children('.new_block_link.np').length > 0 ) {
-          $('#block_' + parent_id).children('.content_body').children('.new_block_link.np').remove();
-          $('#block_' + parent_id).find('.content_body').append(el);
+        var el2 = $('#block_' + parent_id).find('.content_body').first();
+        var first_parent_block = el2.parents("[id^='block_']").first();
+        if ( ('block_' + parent_id) == first_parent_block.attr('id') && el2.children('.new_block_link.np').length > 0 ) {
+          el2.children('.new_block_link.np').remove();
+          el2.append(el);
         }
         else
           $('#block_' + parent_id).append(el);
@@ -169,7 +170,6 @@ BlockContentController.prototype = {
     }
   },
 
-
   move_block_save: function(block_id, parent_id, before_block_id, after_block_id) {
     var that = this;
     var block_id = block_id.replace('block_','');

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

@@ -750,23 +750,38 @@ IndexTable.prototype = {
   	$('#export_message').html("<p class='loading'>Creating export...</p>");  	  	
   	var qs = {};
   	$.each(p, function(k,v) { if (k != '[object Object]') qs[k] = v; });  	
-    $.ajax({ url: h.url, type: h.type, data: qs, success: function(resp) { h.status_url = h.status_url(resp); }, async: false });    
-    setTimeout(function() { that.csv_export_status(h); }, 1000);
+    $.ajax({ 
+      url: h.url, 
+      type: h.type, 
+      data: qs, 
+      success: function(resp) { 
+        h.status_url = h.status_url(resp);
+        setTimeout(function() { that.csv_export_status(h); }, 1000);
+      }
+    });    
+    
   },
   
   csv_export_status: function(h)
   {
     var that = this;
-    $.ajax({
-      url: h.status_url,
-      type: 'get',      
-      success: function(resp) {
-        if (h.ready(resp))
-          window.location = h.final_url(resp);
-        else
-          setTimeout(function() { that.csv_export_status(h); }, 1000);
-      }                      
-    });
+    if ( typeof h.status_url === "function") {
+      console.log('error');
+    }
+    else {
+      $.ajax({
+        url: h.status_url,
+        type: 'get',      
+        success: function(resp) {
+          if (h.ready(resp)) {
+            $('#export_message').html("");    
+            window.location = h.final_url(resp);
+          }
+          else
+            setTimeout(function() { that.csv_export_status(h); }, 1000);
+        }                      
+      });
+    }
   },
   
   pager_div: function(summary)

data/app/controllers/caboose/blocks_controller.rb

@@ -545,6 +545,7 @@ module Caboose
       resp = StdClass.new
       b = Block.find(params[:id])
       resp.new_id = b.duplicate_block(@site.id, params[:page_id], params[:post_id], b.block_type_id, b.parent_id)
+      resp.success = true
       render :json => resp
     end
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.68'
+  VERSION = '0.9.69'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.68
+  version: 0.9.69
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg