From: Afreen Misbah Date: Thu, 23 Jul 2026 09:48:56 +0000 (+0530) Subject: Merge pull request #68845 from rhcs-dashboard/fix-14295 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ecb4c8e700a8de92405f2e91572e3ccfe19da47;p=ceph.git Merge pull request #68845 from rhcs-dashboard/fix-14295 mgr/dashboard: [Dashboard] Incorrect action button label "Edit User" instead of "Save" in Edit User page Reviewed-by: Afreen Misbah --- 4ecb4c8e700a8de92405f2e91572e3ccfe19da47 diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts index a63bcb58c5a,dfd02d41d26..b7d7ddcce6a --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts @@@ -156,11 -154,11 +157,14 @@@ export class PoolFormComponent extends this.editing = this.router.url.startsWith(`/pool/${URLVerbs.EDIT}`); this.action = this.editing ? this.actionLabels.EDIT : this.actionLabels.CREATE; this.resource = $localize`pool`; + this.submitAction = this.editing + ? this.actionLabels.SAVE_CHANGES + : `${this.action} ${_.upperFirst(this.resource)}`; this.authenticate(); this.createForm(); + const nav = this.router.getCurrentNavigation(); + this.fromStorageClass = nav?.extras?.state?.['from'] === FROM_STORAGE_CLASS; + this.previousPath = nav?.extras?.state?.['returnUrl'] || '/pool'; } authenticate() {