caboose-cms 0.8.60 → 0.8.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c5ba850878fe90aaad10b85a49a22fb7ac6315
-  data.tar.gz: a23f403479820953621d16ba00f98fe3d850525e
+  metadata.gz: f36c7fdecc5fc40895fc8cf1cbfa7c0af91b7e10
+  data.tar.gz: d76ad213171289b7f79ba6260c657dfbd37e6f00
 SHA512:
-  metadata.gz: 88908188c6d4f53c82b59e1761d477b61fe88b3040208bf53fcd5184a37af738169accf690a7d242da7e82731f9e0c8244e62da784e0d65918a23da6833a4da0
-  data.tar.gz: 648a6468d05c068df994709e6f2fb38069d9683e08c761e753773a5487e0dfdb8cecd9f0f604c7ad93ce08d265eaa2b27e42300ebe0e06e2704587e6221ff154
+  metadata.gz: 25b912cdbafbedbe3c6e420ca5af6a2e47157274a56151902e2336c25a166a6fe5be288fc7f67015690eb66a8aebcd9cbb835504f222f0d02c7397abc40fdd45
+  data.tar.gz: 3ebe5da2b93ccb8ae12d8dc8bd172dd88441dac80b53618ff44e6e705aa28659bdf4290df51bfd967d76ac3568331ebd9d470c644d68381d04e95aacdd07f82f

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

@@ -90,7 +90,16 @@ IndexTable.prototype = {
   after_print: false,
   table_class: 'data',
   allow_export: false,
-  export_urls: false,
+  export_urls: false, // Example: 
+                      // [
+                      //   {
+                      //     name: 'My Export',  
+                      //     url: '<url that starts export process>',
+                      //     wait_for_processing: true,
+                      //     status_url: function(resp) { return resp.status_url; },
+                      //     ready: function(resp) { return resp.redirect_url; } 
+                      //   }
+                      // ]
           
   //============================================================================
   // End of parameters
@@ -693,31 +702,71 @@ IndexTable.prototype = {
   },
   
   csv_export: function()
+  {
+    var that = this;  	  	
+  	
+    var defaults = {
+  	  name: "Export",
+  	  url: that.base_url + '/export.csv',
+  	  type: 'get',
+  	  wait_for_processing: false,
+  	  status_url: function(resp) { return resp.status_url; },
+  	  ready:      function(resp) { return resp.redirect_url.length > 0; },
+  	  final_url:  function(resp) { return resp.redirect_url; }
+    };
+  	
+  	var p = $('<p/>');  	
+  	$.each(that.export_urls, function(i, h) {  	  
+  	  that.export_urls[i] = $.extend({}, defaults, h);  	  
+      p.append($('<input/>').attr('type', 'button').val(that.export_urls[i].name).click(function(e) { that.csv_export_start($(this).val()); })).append(' ');
+    });
+        
+    var div = $('<div/>').addClass('note')
+      .append($('<p/>').append('Which export would you like to run?'))
+      .append(p)
+      .append($('<div/>').attr('id', 'export_message'))
+      .append($('<p/>').append($('<input/>').attr('type', 'button').val('Cancel').click(function(e) { that.hide_message(); })));        
+    that.show_message(div);          	    
+  },
+  
+  csv_export_start: function(name)
   {
     var that = this;
-    var p = this.pager_params();                  
-  	var qs = [];
-  	$.each(p, function(k,v) {  	  
-  	  if (k != '[object Object]') qs.push('' + k + '=' + encodeURIComponent(v)); 
+    var p = that.pager_params();                  
+  	  	  	
+  	var h = false;  	
+  	$.each(that.export_urls, function(i, h2) {  	 
+  	 if (h2.name == name) { h = h2; return false; } 
   	});
-  	//var url = that.export_url ? that.export_url : that.base_url + '/export.csv';
   	
-  	var urls = that.export_urls ? that.export_urls : { "Export": that.base_url + '/export.csv' };
-  	
-  	if (urls.length == 1)
-  	  window.location = url + '?' + qs.join('&');
-  	else
+  	if (!h.wait_for_processing) 
   	{
-  	  var div = $('<div/>').addClass('note')
-  	    .append($('<p/>').append('Which export would you like to run?'));
-  	  var p = $('<p/>');
-  	  $.each(urls, function(name, url) {     
-        p.append($('<input/>').attr('type', 'button').val(name).click(function(e) { window.location = url + '?' + qs.join('&'); })).append(' ');
-      });               
-      div.append(p);
-      div.append($('<p/>').append($('<input/>').attr('type', 'button').val('Cancel').click(function(e) { that.hide_message(); })));        
-      that.show_message(div);        
-  	}    
+  	  var qs = [];
+  	  $.each(p, function(k,v) { if (k != '[object Object]') qs.push('' + k + '=' + encodeURIComponent(v)); });
+  	  window.location = h.url + '?' + qs.join('&');
+  	  return; 
+  	}
+  	  	
+  	$('#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);
+  },
+  
+  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);
+      }                      
+    });
   },
   
   pager_div: function(summary)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.60'
+  VERSION = '0.8.61'
 end

metadata

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