ack_rocket_cms 0.7.2.3.2 → 0.7.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce65452b72e27c5e8621dd96e6329231e89d0444
-  data.tar.gz: 4bdbbf26db9cb3b7403d297175ad2b06aeef36fe
+  metadata.gz: ce2df31034d42e0b58755c489694203da0eb5639
+  data.tar.gz: 219d49e526e2453ff5ea1e9e0000d5b0988e21e3
 SHA512:
-  metadata.gz: 22944670f0304a50ccd6b2883c3e2cc4a6676e44462c21462391e22a37c03dc5b6efea244e4dd292765306c4d9affe07a976c68bb0beaea9f0002908687d267d
-  data.tar.gz: a715536c55b97e844baa3ed91c621119e18be41ca37fa2a686b06c8237e137b3ff4d6da7c6cda2010308c4209a7219af1d32fbb65b94248d775edd7ca508e5b3
+  metadata.gz: 5f22e992c385bc334cb275f58064e946b33bb6b47e27b26d2e7fb382712cc69b19fed70aa68baa59ed96d38aabb77f4099994881ff51e9309a5b486b4064cd77
+  data.tar.gz: 6d33eeced920b6ea0d17556775ca83315e4eaa9f7bd88f8f10ebc8f7e0df3ea981d38c964e0b18b93e29e7fc3b74ce120096096786e653754d2dfb00f06bbe9e

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.2.3.2)
+    ack_rocket_cms (0.7.2.4)
       addressable
+      ckeditor
       coffee-rails
       devise
       geocoder
-      glebtv-ckeditor
       glebtv-simple_captcha
       jquery-rails
       kaminari
@@ -69,6 +69,13 @@ GEM
     bcrypt (3.1.10)
     bson (2.3.0)
     builder (3.2.2)
+    ckeditor (4.1.1)
+      cocaine
+      orm_adapter (~> 0.5.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.7)
+      climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -89,10 +96,6 @@ GEM
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     geocoder (1.2.7)
-    glebtv-ckeditor (4.4.7)
-      mime-types
-      orm_adapter (~> 0.5.0)
-      rails (~> 4.0)
     glebtv-simple_captcha (0.6.7)
     globalid (0.3.3)
       activesupport (>= 4.1.0)

data/lib/rocket_cms.rb

@@ -20,7 +20,7 @@ require 'rails_admin_toggleable'
 
 require 'x-real-ip'
 
-require 'glebtv-ckeditor'
+require 'ckeditor'
 
 require 'sitemap_generator'
 require 'kaminari'

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.2.3.2"
+  VERSION = "0.7.2.4"
 end

data/rocket_cms.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails_admin'
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
-  spec.add_dependency 'glebtv-ckeditor'
+  spec.add_dependency 'ckeditor'
   spec.add_dependency 'rails_admin_settings', '~> 0.9.0'
   spec.add_dependency 'geocoder'
   spec.add_dependency 'simple-navigation'

data/template.rb

@@ -237,7 +237,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
     edit do
       field :email, :string do
         visible do
-          bindings[:controller].current_user.admin?
+          bindings[:controller].current_user.admin? or (bindings[:controller].current_user.manager? bindings[:controller].current_user == bindings[:object])
         end
       end
       field :name, :string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.2.3.2
+  version: 0.7.2.4
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,7 +200,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: glebtv-ckeditor
+  name: ckeditor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="