ack_rocket_cms 0.7.2.3.2 → 0.7.2.4

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +9 -6
  3. data/lib/rocket_cms.rb +1 -1
  4. data/lib/rocket_cms/version.rb +1 -1
  5. data/rocket_cms.gemspec +1 -1
  6. data/template.rb +1 -1
  7. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ce65452b72e27c5e8621dd96e6329231e89d0444
4
- data.tar.gz: 4bdbbf26db9cb3b7403d297175ad2b06aeef36fe
3
+ metadata.gz: ce2df31034d42e0b58755c489694203da0eb5639
4
+ data.tar.gz: 219d49e526e2453ff5ea1e9e0000d5b0988e21e3
5
5
  SHA512:
6
- metadata.gz: 22944670f0304a50ccd6b2883c3e2cc4a6676e44462c21462391e22a37c03dc5b6efea244e4dd292765306c4d9affe07a976c68bb0beaea9f0002908687d267d
7
- data.tar.gz: a715536c55b97e844baa3ed91c621119e18be41ca37fa2a686b06c8237e137b3ff4d6da7c6cda2010308c4209a7219af1d32fbb65b94248d775edd7ca508e5b3
6
+ metadata.gz: 5f22e992c385bc334cb275f58064e946b33bb6b47e27b26d2e7fb382712cc69b19fed70aa68baa59ed96d38aabb77f4099994881ff51e9309a5b486b4064cd77
7
+ data.tar.gz: 6d33eeced920b6ea0d17556775ca83315e4eaa9f7bd88f8f10ebc8f7e0df3ea981d38c964e0b18b93e29e7fc3b74ce120096096786e653754d2dfb00f06bbe9e
data/Gemfile.lock CHANGED
@@ -1,12 +1,12 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- ack_rocket_cms (0.7.2.3.2)
4
+ ack_rocket_cms (0.7.2.4)
5
5
  addressable
6
+ ckeditor
6
7
  coffee-rails
7
8
  devise
8
9
  geocoder
9
- glebtv-ckeditor
10
10
  glebtv-simple_captcha
11
11
  jquery-rails
12
12
  kaminari
@@ -69,6 +69,13 @@ GEM
69
69
  bcrypt (3.1.10)
70
70
  bson (2.3.0)
71
71
  builder (3.2.2)
72
+ ckeditor (4.1.1)
73
+ cocaine
74
+ orm_adapter (~> 0.5.0)
75
+ climate_control (0.0.3)
76
+ activesupport (>= 3.0)
77
+ cocaine (0.5.7)
78
+ climate_control (>= 0.0.3, < 1.0)
72
79
  coffee-rails (4.1.0)
73
80
  coffee-script (>= 2.2.0)
74
81
  railties (>= 4.0.0, < 5.0)
@@ -89,10 +96,6 @@ GEM
89
96
  font-awesome-rails (4.3.0.0)
90
97
  railties (>= 3.2, < 5.0)
91
98
  geocoder (1.2.7)
92
- glebtv-ckeditor (4.4.7)
93
- mime-types
94
- orm_adapter (~> 0.5.0)
95
- rails (~> 4.0)
96
99
  glebtv-simple_captcha (0.6.7)
97
100
  globalid (0.3.3)
98
101
  activesupport (>= 4.1.0)
data/lib/rocket_cms.rb CHANGED
@@ -20,7 +20,7 @@ require 'rails_admin_toggleable'
20
20
 
21
21
  require 'x-real-ip'
22
22
 
23
- require 'glebtv-ckeditor'
23
+ require 'ckeditor'
24
24
 
25
25
  require 'sitemap_generator'
26
26
  require 'kaminari'
data/lib/rocket_cms/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.7.2.3.2"
2
+ VERSION = "0.7.2.4"
3
3
  end
data/rocket_cms.gemspec CHANGED
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
32
32
  spec.add_dependency 'rails_admin'
33
33
  spec.add_dependency 'rails_admin_nested_set'
34
34
  spec.add_dependency 'rails_admin_toggleable'
35
- spec.add_dependency 'glebtv-ckeditor'
35
+ spec.add_dependency 'ckeditor'
36
36
  spec.add_dependency 'rails_admin_settings', '~> 0.9.0'
37
37
  spec.add_dependency 'geocoder'
38
38
  spec.add_dependency 'simple-navigation'
data/template.rb CHANGED
@@ -237,7 +237,7 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
237
237
  edit do
238
238
  field :email, :string do
239
239
  visible do
240
- bindings[:controller].current_user.admin?
240
+ bindings[:controller].current_user.admin? or (bindings[:controller].current_user.manager? bindings[:controller].current_user == bindings[:object])
241
241
  end
242
242
  end
243
243
  field :name, :string
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ack_rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.2.3.2
4
+ version: 0.7.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-03-02 00:00:00.000000000 Z
12
+ date: 2015-03-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -200,7 +200,7 @@ dependencies:
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  - !ruby/object:Gem::Dependency
203
- name: glebtv-ckeditor
203
+ name: ckeditor
204
204
  requirement: !ruby/object:Gem::Requirement
205
205
  requirements:
206
206
  - - ">="