decidim-admin 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94789f56607b045447a22c1041b9587e7c685479
-  data.tar.gz: ceb1f77e3acf622b961b93c641bea5d635c9da40
+  metadata.gz: 3ccb01ac339fc58733de0b80646a81932272c0f8
+  data.tar.gz: 4e28efb0072d97e8e479dfa5efd2184a83187ace
 SHA512:
-  metadata.gz: c5ad28b173a634304e469f8be080ec13acc2f128aff1d889892602323c532285af11912ae2d9922985cb3b7cac07f981cb43f7b283181990c63de6d280bfe5d1
-  data.tar.gz: cd5ceec925fad373110abef3c964a32952790523eda092e7c6dc897f1e471075b6aae1b02916e43bd63ddcfde4baf0ace0dc0bd2b0a43420320a37ddfc78f7c0
+  metadata.gz: eb4b47d84eaf6f6f17e0c53db999b54582af2a63b638d50d063e323e432cbe49cbea3474890c0736569c287eb02ff7ee61e3e38782b0648bbbcefbaa14704036
+  data.tar.gz: 3b0979b25627ee94a5f2d6b4182a360797f34bbe041973ba3e6a9d850e08c566a4ba57a61371029f7187c4c575e3818d8353a33a86ff21c3d475eb07ed16c8b6

data/app/models/decidim/admin/abilities/user_manager_ability.rb

@@ -10,19 +10,22 @@ module Decidim
           super
 
           can :manage, :managed_users
+
           cannot [:new, :create], :managed_users if empty_available_authorizations?
+
           can :impersonate, Decidim::User do |user_to_impersonate|
-            user_to_impersonate.managed? && Decidim::ImpersonationLog.active.empty?
+            user_to_impersonate.managed? && Decidim::ImpersonationLog.active.where(admin: user).empty?
           end
+
           can :promote, Decidim::User do |user_to_promote|
-            user_to_promote.managed? && Decidim::ImpersonationLog.active.empty?
+            user_to_promote.managed? && Decidim::ImpersonationLog.active.where(admin: user).empty?
           end
         end
 
         private
 
         def empty_available_authorizations?
-          @context[:current_organization] && @context[:current_organization].available_authorizations.empty?
+          user.organization.available_authorizations.empty?
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,28 +172,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Organization administration