From c8fc065c18415164ad2cce71d1abe699eb26ca3b Mon Sep 17 00:00:00 2001 From: Ken Sternberg Date: Thu, 15 Feb 2024 09:37:21 -0800 Subject: [PATCH] web: change "delete" verb to "remove" for one-to-many relationships Two changes here - make a new property on the BulkDeleteForm view so an external user can set the button label dynamically, with the original "Delete" as default. - Add the property to the RelatedGroupsList view, with the word "Remove," as requested by Tana. --- web/src/admin/groups/RelatedGroupList.ts | 1 + web/src/elements/forms/DeleteBulkForm.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/src/admin/groups/RelatedGroupList.ts b/web/src/admin/groups/RelatedGroupList.ts index 50edeea2a8ea..2777ee82a67f 100644 --- a/web/src/admin/groups/RelatedGroupList.ts +++ b/web/src/admin/groups/RelatedGroupList.ts @@ -125,6 +125,7 @@ export class RelatedGroupList extends Table { actionSubtext=${msg( str`Are you sure you want to remove user ${this.targetUser?.username} from the following groups?`, )} + buttonLabel=${msg("Remove")} .objects=${this.selectedElements} .delete=${(item: Group) => { if (!this.targetUser) return; diff --git a/web/src/elements/forms/DeleteBulkForm.ts b/web/src/elements/forms/DeleteBulkForm.ts index 693184b715dc..278abd0d7df6 100644 --- a/web/src/elements/forms/DeleteBulkForm.ts +++ b/web/src/elements/forms/DeleteBulkForm.ts @@ -131,6 +131,9 @@ export class DeleteBulkForm extends ModalButton { @property() actionSubtext?: string; + @property() + buttonLabel = msg("Delete"); + @property({ attribute: false }) metadata: (item: T) => BulkDeleteMetadata = (item: T) => { const rec = item as Record; @@ -222,7 +225,7 @@ export class DeleteBulkForm extends ModalButton { }} class="pf-m-danger" > - ${msg("Delete")}   {