caboose-cms 0.9.34 → 0.9.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2d9ac08cdca0e00187c69413fdeee6d9d00e2c0b
4
- data.tar.gz: b20ab6d1168515bb64882f0e598764e498b6ba96
3
+ metadata.gz: 586770e73073bd4af63498eb268323ad299b2c52
4
+ data.tar.gz: 8b937ba9c1e5e478353d77a9ada8fc1da27990cf
5
5
  SHA512:
6
- metadata.gz: 30cd9b1fd883e91ce40102ca07cf9142aa00a6ff35b52d2c3afe6db85f194fcd3c69bb3ef7d02b358423ed35ec29405f3d92b3f3f709ddad5ad8459f7c15ea39
7
- data.tar.gz: 5efa962ce01c0bc08f90b0ead4cada55b36a493ea3243682c11ec5cf1900d039343016d11def827ce693bf81749729d59544b5b08033c2d14b8eccef32ddd01e
6
+ metadata.gz: deec6c98840a36fe8337e57aaf11d8ff98acfaea9b47de3d9cb425518ac85364792866f40388b0a64ef3d168d4717eab365cf2bfb32999e9540b7f42cde5cecd
7
+ data.tar.gz: 5f64e39453aa297259bf6d777a7b67ee265d612d21d497c308b3d949b21333e5d6678849d8dd99999befbc8533954c2598a00ea1b3b27442f95a09b9523b53f4
@@ -37,14 +37,14 @@ module Caboose
37
37
  'description' => '',
38
38
  'name_like' => '',
39
39
  'description_like' => '',
40
- }
40
+ }
41
41
  pager = Caboose::Pager.new(params, h, {
42
- 'model' => 'Caboose::Site',
43
- 'sort' => 'name',
44
- 'desc' => 'false',
45
- 'base_url' => "/admin/sites",
42
+ 'model' => 'Caboose::Site',
43
+ 'sort' => 'name',
44
+ 'desc' => 'false',
45
+ 'base_url' => "/admin/sites",
46
46
  'items_per_page' => 1000
47
- })
47
+ })
48
48
  render :json => {
49
49
  :pager => pager,
50
50
  :models => pager.items.as_json(:include => :domains)
@@ -441,14 +441,14 @@ module Caboose
441
441
 
442
442
  def to_json
443
443
  {
444
- :base_url => @options['base_url'],
445
- :sort => @options['sort'],
446
- :desc => @options['desc'],
447
- :item_count => @options['item_count'],
448
- :items_per_page => @options['items_per_page'],
449
- :page => @options['page'],
444
+ :base_url => @options ? @options['base_url'] : nil,
445
+ :sort => @options ? @options['sort'] : nil,
446
+ :desc => @options ? @options['desc'] : nil,
447
+ :item_count => @options ? @options['item_count'] : nil,
448
+ :items_per_page => @options ? @options['items_per_page'] : nil,
449
+ :page => @options ? @options['page'] : nil,
450
450
  :use_url_params => @use_url_params
451
- }
451
+ }.to_json
452
452
  end
453
453
  end
454
454
  end
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.9.34'
2
+ VERSION = '0.9.35'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.34
4
+ version: 0.9.35
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-07 00:00:00.000000000 Z
11
+ date: 2016-12-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg