{{ "editGroupCollectionsDesc" | i18n }} - + {{ "restrictedCollectionAssignmentDesc" | i18n }}
diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts index a02c4a8da95..38ef0025349 100644 --- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts @@ -196,12 +196,17 @@ export class GroupAddEditComponent implements OnInit, OnDestroy { }), ); - protected canEditAnyCollection$ = combineLatest([ + protected canAssignAccessToAnyCollection$ = combineLatest([ this.organization$, this.flexibleCollectionsV1Enabled$, + this.allowAdminAccessToAllCollectionItems$, ]).pipe( - map(([org, flexibleCollectionsV1Enabled]) => - org.canEditAnyCollection(flexibleCollectionsV1Enabled), + map( + ([org, flexibleCollectionsV1Enabled, allowAdminAccessToAllCollectionItems]) => + org.canEditAnyCollection(flexibleCollectionsV1Enabled) || + // Manage Groups custom permission cannot edit any collection but they can assign access from this dialog + // if permitted by collection management settings + (org.permissions.manageGroups && allowAdminAccessToAllCollectionItems), ), ); diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html index 35e28b5239e..149277b8179 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html @@ -278,9 +278,17 @@