bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 01:33:33 +00:00
Code Issues Releases Wiki Activity

[AC-2703] Fix copy in members and groups modals for custom users (#9408)

Browse Source 
* Fix copy in members and groups modals for custom users

* Fix nesting in member dialog template
This commit is contained in:
Thomas Rittson
2024-05-30 10:49:32 +10:00
committed by GitHub
parent df193dd869
commit fb7273beb8
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts
View File

@@ -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),
),
);