decidim-admin 0.6.7 → 0.6.8

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 (3) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/decidim/admin/abilities/user_manager_ability.rb +6 -3
  3. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 94789f56607b045447a22c1041b9587e7c685479
4
- data.tar.gz: ceb1f77e3acf622b961b93c641bea5d635c9da40
3
+ metadata.gz: 3ccb01ac339fc58733de0b80646a81932272c0f8
4
+ data.tar.gz: 4e28efb0072d97e8e479dfa5efd2184a83187ace
5
5
  SHA512:
6
- metadata.gz: c5ad28b173a634304e469f8be080ec13acc2f128aff1d889892602323c532285af11912ae2d9922985cb3b7cac07f981cb43f7b283181990c63de6d280bfe5d1
7
- data.tar.gz: cd5ceec925fad373110abef3c964a32952790523eda092e7c6dc897f1e471075b6aae1b02916e43bd63ddcfde4baf0ace0dc0bd2b0a43420320a37ddfc78f7c0
6
+ metadata.gz: eb4b47d84eaf6f6f17e0c53db999b54582af2a63b638d50d063e323e432cbe49cbea3474890c0736569c287eb02ff7ee61e3e38782b0648bbbcefbaa14704036
7
+ data.tar.gz: 3b0979b25627ee94a5f2d6b4182a360797f34bbe041973ba3e6a9d850e08c566a4ba57a61371029f7187c4c575e3818d8353a33a86ff21c3d475eb07ed16c8b6
data/app/models/decidim/admin/abilities/user_manager_ability.rb CHANGED
@@ -10,19 +10,22 @@ module Decidim
10
10
  super
11
11
 
12
12
  can :manage, :managed_users
13
+
13
14
  cannot [:new, :create], :managed_users if empty_available_authorizations?
15
+
14
16
  can :impersonate, Decidim::User do |user_to_impersonate|
15
- user_to_impersonate.managed? && Decidim::ImpersonationLog.active.empty?
17
+ user_to_impersonate.managed? && Decidim::ImpersonationLog.active.where(admin: user).empty?
16
18
  end
19
+
17
20
  can :promote, Decidim::User do |user_to_promote|
18
- user_to_promote.managed? && Decidim::ImpersonationLog.active.empty?
21
+ user_to_promote.managed? && Decidim::ImpersonationLog.active.where(admin: user).empty?
19
22
  end
20
23
  end
21
24
 
22
25
  private
23
26
 
24
27
  def empty_available_authorizations?
25
- @context[:current_organization] && @context[:current_organization].available_authorizations.empty?
28
+ user.organization.available_authorizations.empty?
26
29
  end
27
30
  end
28
31
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.7
4
+ version: 0.6.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-10-09 00:00:00.000000000 Z
13
+ date: 2017-10-17 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.6.7
21
+ version: 0.6.8
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 0.6.7
28
+ version: 0.6.8
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: rails
31
31
  requirement: !ruby/object:Gem::Requirement
@@ -172,28 +172,28 @@ dependencies:
172
172
  requirements:
173
173
  - - '='
174
174
  - !ruby/object:Gem::Version
175
- version: 0.6.7
175
+ version: 0.6.8
176
176
  type: :development
177
177
  prerelease: false
178
178
  version_requirements: !ruby/object:Gem::Requirement
179
179
  requirements:
180
180
  - - '='
181
181
  - !ruby/object:Gem::Version
182
- version: 0.6.7
182
+ version: 0.6.8
183
183
  - !ruby/object:Gem::Dependency
184
184
  name: decidim-participatory_processes
185
185
  requirement: !ruby/object:Gem::Requirement
186
186
  requirements:
187
187
  - - '='
188
188
  - !ruby/object:Gem::Version
189
- version: 0.6.7
189
+ version: 0.6.8
190
190
  type: :development
191
191
  prerelease: false
192
192
  version_requirements: !ruby/object:Gem::Requirement
193
193
  requirements:
194
194
  - - '='
195
195
  - !ruby/object:Gem::Version
196
- version: 0.6.7
196
+ version: 0.6.8
197
197
  description: Organization administration to manage a single organization.
198
198
  email:
199
199
  - josepjaume@gmail.com
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
469
469
  version: '0'
470
470
  requirements: []
471
471
  rubyforge_project:
472
- rubygems_version: 2.6.13
472
+ rubygems_version: 2.6.11
473
473
  signing_key:
474
474
  specification_version: 4
475
475
  summary: Organization administration