Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-04 18:37:45 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1110] allow members with Delete Any Collection to delete collections (#4925)

Browse Source 
* [AC-1110] add anyCollection permission to delete collection

* [AC-1110] add missing permission to header collection delete
This commit is contained in:
Jake Fink 2023-03-10 12:53:41 -05:00 committed by GitHub
parent 7892834f97
commit e480f7cfbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
View File

@ -116,7 +116,10 @@ export class BulkDeleteDialogComponent {
} }
private async deleteCollections(): Promise<any> { private async deleteCollections(): Promise<any> {
if (!this.organization.canDeleteAssignedCollections) { if (
!this.organization.canDeleteAssignedCollections &&
!this.organization.canDeleteAnyCollection
) {
this.platformUtilsService.showToast( this.platformUtilsService.showToast(
"error", "error",
this.i18nService.t("errorOccurred"), this.i18nService.t("errorOccurred"),

5
apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
View File

@ -209,7 +209,10 @@ export class VaultHeaderComponent {
} }
async deleteCollection(collection: CollectionView): Promise<void> { async deleteCollection(collection: CollectionView): Promise<void> {
if (!this.organization.canDeleteAssignedCollections) { if (
!this.organization.canDeleteAnyCollection &&
!this.organization.canDeleteAssignedCollections
) {
this.platformUtilsService.showToast( this.platformUtilsService.showToast(
"error", "error",
this.i18nService.t("errorOccurred"), this.i18nService.t("errorOccurred"),

6
apps/web/src/app/vault/org-vault/vault-items.component.ts
View File

@ -244,7 +244,10 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDe
} }
async deleteCollection(collection: CollectionView): Promise<void> { async deleteCollection(collection: CollectionView): Promise<void> {
if (!this.organization.canDeleteAssignedCollections) { if (
!this.organization.canDeleteAssignedCollections &&
!this.organization.canDeleteAnyCollection
) {
this.platformUtilsService.showToast( this.platformUtilsService.showToast(
"error", "error",
this.i18nService.t("errorOccurred"), this.i18nService.t("errorOccurred"),
@ -270,6 +273,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDe
null, null,
this.i18nService.t("deletedCollectionId", collection.name) this.i18nService.t("deletedCollectionId", collection.name)
); );
this.actionPromise = null;
await this.refresh(); await this.refresh();
} catch (e) { } catch (e) {
this.logService.error(e); this.logService.error(e);