rocket_cms 0.5.16 → 0.5.17

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: e694021d4df801dfd46796deeffaf2c395387366
4
- data.tar.gz: 2f6e535af2184fa074a03dba2db41cfec191f1c1
3
+ metadata.gz: 183b6fad15aa7fcb254e60f5b0d3703abbd7cb6e
4
+ data.tar.gz: 47bb614bbcada537e47fef731bab9ccbb8ec0c3e
5
5
  SHA512:
6
- metadata.gz: 95dbf409c4fc16656c5ccbc6c99903eaef39849cf1804b94e8918e3620678fe637071b3b7ed23e9e2f7abf4799dc20604b1f1ac5235183cf972442e2ab0c721b
7
- data.tar.gz: f300f77a6abe8f4d24724c133f9b6e36e5bfe696bca2832327f7b179df622ad7fc2d3ee1b07a6133034a4a76dbbfe5257f28054202f77dd34f2784bc794b5a9b
6
+ metadata.gz: 75b0ebd53df1dcd685cff324eabc5ceeaefc2eded8b5de82f616e801f9ed6248e27c95e2b7d3b7d99e41d80fb41602f598495c3665456513f4647cba87826082
7
+ data.tar.gz: b66355bf0be0fcc1782336676258ccb7e7c4878da71857c1d99cd027128f25c58d4f632358c25e6f41955edaa12711d3bb57372cc48dd558ac7b43bde2a737a4
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.5.16)
4
+ rocket_cms (0.5.17)
5
5
  addressable
6
6
  coffee-rails
7
7
  devise
@@ -11,10 +11,18 @@ module RailsAdmin
11
11
  obj = bindings[:object]
12
12
  ret = []
13
13
  menus = Rails.cache.fetch 'menus', expires_in: 10.minutes do
14
- ::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
14
+ if RocketCMS.mongoid?
15
+ ::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
16
+ else
17
+ ::Menu.all.map { |m| {id: m.id, name: m.name } }
18
+ end
15
19
  end
16
20
  menus.each do |m|
17
- on = obj.menu_ids.include?(BSON::ObjectId.from_string(m[:id]))
21
+ if RocketCMS.mongoid?
22
+ on = obj.menu_ids.include?(BSON::ObjectId.from_string(m[:id]))
23
+ else
24
+ on = obj.menu_ids.include?(m[:id].to_i)
25
+ end
18
26
  ret << bindings[:view].link_to(
19
27
  m[:name],
20
28
  bindings[:view].toggle_menu_path(model_name: @abstract_model, id: obj.id, menu: m[:id], on: !on),
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.5.16"
2
+ VERSION = "0.5.17"
3
3
  end
data/template.rb CHANGED
@@ -79,7 +79,7 @@ create_file '.gitignore' do <<-TEXT
79
79
  /public/ckeditor_assets
80
80
  /public/assets
81
81
  #{if mongoid then '/config/mongoid.yml' else '/config/database.yml' end}
82
- /config/sectets.yml
82
+ /config/secrets.yml
83
83
  TEXT
84
84
  end
85
85
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.16
4
+ version: 0.5.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-17 00:00:00.000000000 Z
11
+ date: 2014-11-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler