Merge pull request #450 from datacite/consortium-permissions

fix permissions for consortium to update its own record. #449
datacite · Mar 12, 2020 · 909a596 · 909a596
2 parents 5f73e52 + db68639
commit 909a596
Show file tree

Hide file tree

Showing 3 changed files with 274 additions and 213 deletions.
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -20,13 +20,10 @@ def initialize(user)
     elsif user.role_id == "staff_user"
       can :read, :all
     elsif user.role_id == "consortium_admin" && user.provider_id.present?
-      can [:create, :destroy], Provider do |provider|
+      can [:manage, :read_billing_information], Provider do |provider|
         user.provider_id.casecmp(provider.consortium_id)
       end
-      can [:update, :read, :read_billing_information], Provider do |provider|
-        user.provider_id.casecmp(provider.id) || user.provider_id.casecmp(provider.consortium_id)
-      end
-      can [:read], Provider
+      can [:update, :read, :read_billing_information], Provider, symbol: user.provider_id.upcase
       can [:manage], ProviderPrefix do |provider_prefix|
         provider_prefix.provider && user.provider_id.casecmp(provider_prefix.provider.consortium_id)
       end
@@ -52,7 +49,6 @@ def initialize(user)
       end
     elsif user.role_id == "provider_admin" && user.provider_id.present?
       can [:update, :read, :read_billing_information], Provider, symbol: user.provider_id.upcase
-      can [:read], Provider
       can [:manage], ProviderPrefix, provider_id: user.provider_id
       can [:manage], Client, provider_id: user.provider_id
       can [:manage], ClientPrefix #, :client_id => user.provider_id