caboose-cms 0.9.34 → 0.9.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d9ac08cdca0e00187c69413fdeee6d9d00e2c0b
-  data.tar.gz: b20ab6d1168515bb64882f0e598764e498b6ba96
+  metadata.gz: 586770e73073bd4af63498eb268323ad299b2c52
+  data.tar.gz: 8b937ba9c1e5e478353d77a9ada8fc1da27990cf
 SHA512:
-  metadata.gz: 30cd9b1fd883e91ce40102ca07cf9142aa00a6ff35b52d2c3afe6db85f194fcd3c69bb3ef7d02b358423ed35ec29405f3d92b3f3f709ddad5ad8459f7c15ea39
-  data.tar.gz: 5efa962ce01c0bc08f90b0ead4cada55b36a493ea3243682c11ec5cf1900d039343016d11def827ce693bf81749729d59544b5b08033c2d14b8eccef32ddd01e
+  metadata.gz: deec6c98840a36fe8337e57aaf11d8ff98acfaea9b47de3d9cb425518ac85364792866f40388b0a64ef3d168d4717eab365cf2bfb32999e9540b7f42cde5cecd
+  data.tar.gz: 5f64e39453aa297259bf6d777a7b67ee265d612d21d497c308b3d949b21333e5d6678849d8dd99999befbc8533954c2598a00ea1b3b27442f95a09b9523b53f4

data/app/controllers/caboose/sites_controller.rb

@@ -37,14 +37,14 @@ module Caboose
         'description'       => '',
         'name_like'         => '',
         'description_like'  => '',
-      }      
+      }
       pager = Caboose::Pager.new(params, h, {      
-        'model' => 'Caboose::Site',
-        'sort'  => 'name',
-        'desc'  => 'false',
-        'base_url' => "/admin/sites",
+        'model'          => 'Caboose::Site',
+        'sort'           => 'name',
+        'desc'           => 'false',
+        'base_url'       => "/admin/sites",
         'items_per_page' => 1000        
-      })      
+      })
       render :json => {
         :pager => pager,
         :models => pager.items.as_json(:include => :domains)

data/app/models/caboose/page_bar_generator.rb

@@ -441,14 +441,14 @@ module Caboose
     
     def to_json
       {
-        :base_url       => @options['base_url'],
-        :sort           => @options['sort'],
-        :desc           => @options['desc'],
-        :item_count     => @options['item_count'],  		
-        :items_per_page => @options['items_per_page'],
-        :page           => @options['page'],		  		
+        :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  				  		
-      }
+      }.to_json
     end
   end
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.34'
+  VERSION = '0.9.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.34
+  version: 0.9.35
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg