caboose-cms 0.9.44 → 0.9.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fbbd00c48eed01800eb9778a028c755fea1c8c7
-  data.tar.gz: 8351b765c406a3c786178389be493728e8012b0a
+  metadata.gz: e45d310e511ea1133be2c81e81d4f9aa9fe8398c
+  data.tar.gz: c2491ae0770cb1eee05adb3607f7e7f2d5f25156
 SHA512:
-  metadata.gz: f606ef52d93d62c70270e58b732cb7461caf1cfc5e48bf6b5c03244a83ea93a3d6d9a26e79b549f68a7d0387ef917bfbe8430415a7e69b66b35c14fdb29a0577
-  data.tar.gz: 2d905019b06a99aca52bb2d029299724fd88f4a270961fe26f6881a09e16132cab69d5cb59f3dc6b9e734de742556594cb8d12d685829cc470e065d81f036e8a
+  metadata.gz: d487a8fa40d900ec40578c8d7016274b172786c9041830b96a5a74431ce99607a621a968d4106e628e87b43510982a2a062a345a219e9673997d272abd50cbcd
+  data.tar.gz: 50b8e3e8bb22855e7be22a111054715cef712b8ded6b54acdad874baaafd5063d9768f10e57f625ab1a36fd68ac55e5995e6ce5d54cb44db2e030e772092e82e

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

@@ -188,8 +188,8 @@ IndexTable.prototype = {
     // Set both hash and querystring values in the pager
     for (var i in b)
     {
-      if (i == 'sort' || i == 'desc' || i == 'page')      
-        this.pager.options[i] = b[i];
+      if (i == 'sort' || i == 'desc' || i == 'page')        
+        this.pager.options[i] = i == 'sort' ? b[i] : parseInt(b[i]);      
       else
         this.pager.params[i] = b[i];              
     }
@@ -770,12 +770,12 @@ IndexTable.prototype = {
   },
   
   pager_div: function(summary)
-  {
+  {    
     var that = this;
     var p = this.pager;
     
     // Set default parameter values if not present    
-    if (!p.options.items_per_page) p.options.items_per_page = 10  
+    if (!p.options.items_per_page) p.options.items_per_page = 10    
     if (!p.options.page) 		       p.options.page           = 1   
   		
   	var page = parseInt(p.options.page);
@@ -783,8 +783,8 @@ IndexTable.prototype = {
   	// Max links to show (must be odd) 
   	var total_links = 5;
   	var prev_page = page - 1;
-  	var next_page = page + 1;
-  	var total_pages = Math.ceil(parseFloat(p.options.item_count)/parseFloat(p.options.items_per_page));
+  	var next_page = page + 1;  	
+  	var total_pages = Math.ceil(parseFloat(p.options.item_count)/parseFloat(p.options.items_per_page));  	
   	var start = 1;
   	var stop = 1;
   	
@@ -806,18 +806,18 @@ IndexTable.prototype = {
   			if (start < 1) start = 1;
   		}
   	}
-  	
+  	  	
   	var div = $('<div/>').addClass('pager');
   	if (summary)
   	  div.append($('<p/>').html("Results: showing page " + page + " of " + total_pages));
 
   	if (total_pages > 1)
-  	{
+  	{  	  
   	  var div2 = $('<div/>').addClass('page_links');
   	  if (page > 1)
   	    div2.append($('<a/>').attr('href', this.pager_hash({ page: prev_page })).html('Previous').click(function(e) { that.hash_click(e, this); }));  	        	      	  
   	  for (i=start; i<=stop; i++)
-  	  {
+  	  {  	    
   	  	if (page != i)
   	  	  div2.append($('<a/>').attr('href', this.pager_hash({ page: i })).html(i).click(function(e) { that.hash_click(e, this); }));
   	  	else
@@ -826,7 +826,7 @@ IndexTable.prototype = {
   	  if (page < total_pages)
   	    div2.append($('<a/>').attr('href', this.pager_hash({ page: next_page })).html('Next').click(function(e) { that.hash_click(e, this); }));
   	  div.append(div2);
-  	}
+  	}  	
   	return div;
   },
   
@@ -840,15 +840,12 @@ IndexTable.prototype = {
   pager_params: function(h)
   {
     var that = this;
-    var skip = this.pager.options && this.pager.options.skip ? this.pager.options.skip : [];    
+    var skip = this.pager.skip ? this.pager.skip : [];    
     var p = {};
-    for (var i in this.pager.params) if (skip.indexOf(i) == -1) p[i] = this.pager.params[i];
-    if (this.pager.options)
-    {      
-      if (this.pager.options.sort) p.sort = this.pager.options.sort;
-      if (this.pager.options.desc) p.desc = this.pager.options.desc ? 1 : 0;
-      if (this.pager.options.page) p.page = this.pager.options.page;
-    }
+    for (var i in this.pager.params) if (skip.indexOf(i) == -1) p[i] = this.pager.params[i];          
+    if (this.pager.options.sort) p.sort = this.pager.options.sort;
+    if (this.pager.options.desc) p.desc = this.pager.options.desc ? 1 : 0;
+    if (this.pager.options.page) p.page = this.pager.options.page;    
     if (h)      
     {                  
       for (var i in h)

data/app/models/caboose/page_bar_generator.rb

@@ -441,14 +441,20 @@ module Caboose
     
     def to_json
       {
-        :base_url       => @options ? @options['base_url']       : nil,
-        :sort           => @options ? @options['sort']           : nil,
-        :desc           => @options ? @options['desc']           : nil,
-        :item_count     => @options ? @options['item_count']     : nil,  		
-        :items_per_page => @options ? @options['items_per_page'] : nil,
-        :page           => @options ? @options['page']           : nil,		  		
-        :use_url_params => @use_url_params  				  		
+        :options        => @options,        
+        :params         => @params,
+        :use_url_params => @use_url_params
+        
+        #:base_url       => @options ? @options['base_url']       : nil,
+        #:sort           => @options ? @options['sort']           : nil,
+        #:desc           => @options ? @options['desc']           : nil,
+        #:item_count     => @options ? @options['item_count']     : nil,  		
+        #:items_per_page => @options ? @options['items_per_page'] : nil,
+        #:page           => @options ? @options['page']           : nil,
+        #:params         => @params,
+        #:use_url_params => @use_url_params
       }.to_json
     end
+        
   end
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.44'
+  VERSION = '0.9.45'
 end

metadata

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