diff --git a/apps/web/src/app/vault/core/views/collection-admin.view.ts b/apps/web/src/app/vault/core/views/collection-admin.view.ts index 96a8150b0a..f8695ba217 100644 --- a/apps/web/src/app/vault/core/views/collection-admin.view.ts +++ b/apps/web/src/app/vault/core/views/collection-admin.view.ts @@ -85,14 +85,26 @@ export class CollectionAdminView extends CollectionView { * Whether the user can modify user access to this collection */ canEditUserAccess(org: Organization, flexibleCollectionsV1Enabled: boolean): boolean { - return this.canEdit(org, flexibleCollectionsV1Enabled) || org.permissions.manageUsers; + const allowAdminAccessToAllCollectionItems = + !flexibleCollectionsV1Enabled || org.allowAdminAccessToAllCollectionItems; + + return ( + (org.permissions.manageUsers && allowAdminAccessToAllCollectionItems) || + this.canEdit(org, flexibleCollectionsV1Enabled) + ); } /** * Whether the user can modify group access to this collection */ canEditGroupAccess(org: Organization, flexibleCollectionsV1Enabled: boolean): boolean { - return this.canEdit(org, flexibleCollectionsV1Enabled) || org.permissions.manageGroups; + const allowAdminAccessToAllCollectionItems = + !flexibleCollectionsV1Enabled || org.allowAdminAccessToAllCollectionItems; + + return ( + (org.permissions.manageGroups && allowAdminAccessToAllCollectionItems) || + this.canEdit(org, flexibleCollectionsV1Enabled) + ); } /**