rocket_cms 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e694021d4df801dfd46796deeffaf2c395387366
-  data.tar.gz: 2f6e535af2184fa074a03dba2db41cfec191f1c1
+  metadata.gz: 183b6fad15aa7fcb254e60f5b0d3703abbd7cb6e
+  data.tar.gz: 47bb614bbcada537e47fef731bab9ccbb8ec0c3e
 SHA512:
-  metadata.gz: 95dbf409c4fc16656c5ccbc6c99903eaef39849cf1804b94e8918e3620678fe637071b3b7ed23e9e2f7abf4799dc20604b1f1ac5235183cf972442e2ab0c721b
-  data.tar.gz: f300f77a6abe8f4d24724c133f9b6e36e5bfe696bca2832327f7b179df622ad7fc2d3ee1b07a6133034a4a76dbbfe5257f28054202f77dd34f2784bc794b5a9b
+  metadata.gz: 75b0ebd53df1dcd685cff324eabc5ceeaefc2eded8b5de82f616e801f9ed6248e27c95e2b7d3b7d99e41d80fb41602f598495c3665456513f4647cba87826082
+  data.tar.gz: b66355bf0be0fcc1782336676258ccb7e7c4878da71857c1d99cd027128f25c58d4f632358c25e6f41955edaa12711d3bb57372cc48dd558ac7b43bde2a737a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.5.16)
+    rocket_cms (0.5.17)
       addressable
       coffee-rails
       devise

data/lib/rocket_cms/rails_admin_menu.rb

@@ -11,10 +11,18 @@ module RailsAdmin
             obj = bindings[:object]
             ret = []
             menus = Rails.cache.fetch 'menus', expires_in: 10.minutes do
-              ::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
+              if RocketCMS.mongoid?
+                ::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
+              else
+                ::Menu.all.map { |m| {id: m.id, name: m.name } }
+              end
             end
             menus.each do |m|
-              on = obj.menu_ids.include?(BSON::ObjectId.from_string(m[:id]))
+              if RocketCMS.mongoid?
+                on = obj.menu_ids.include?(BSON::ObjectId.from_string(m[:id]))
+              else
+                on = obj.menu_ids.include?(m[:id].to_i)
+              end
               ret << bindings[:view].link_to(
                 m[:name],
                 bindings[:view].toggle_menu_path(model_name: @abstract_model, id: obj.id, menu: m[:id], on: !on),

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.5.16"
+  VERSION = "0.5.17"
 end

data/template.rb

@@ -79,7 +79,7 @@ create_file '.gitignore' do <<-TEXT
 /public/ckeditor_assets
 /public/assets
 #{if mongoid then '/config/mongoid.yml' else '/config/database.yml' end}
-/config/sectets.yml
+/config/secrets.yml
 TEXT
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler