From: Volker Theile <vtheile@suse.com>
Date: Tue, 15 May 2018 12:44:22 +0000 (+0200)
Subject: mgr/dashboard: Deletion dialog falsely executes deletion when pressing 'Cancel'
X-Git-Tag: v14.0.0~114^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0473b02872f9dbc1993ec5d6686484c24986e85c;p=ceph.git

mgr/dashboard: Deletion dialog falsely executes deletion when pressing 'Cancel'

If a deletion fails and the 'Cancel' button is pressed to close the dialog, then the deletion process is triggered again.

Signed-off-by: Volker Theile <vtheile@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.html
index 8f89a8d9e8d6..5054785be89a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.html
@@ -7,7 +7,6 @@
   <ng-container class="modal-content">
     <form name="deletionForm"
           #formDir="ngForm"
-          (submit)="delete($event)"
           [formGroup]="deletionForm"
           novalidate>
       <div class="modal-body">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.ts
index 2e381fb8e1cc..d30d2e69e4eb 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.ts
@@ -74,10 +74,6 @@ export class DeletionModalComponent implements OnInit {
     this.confirmation.updateValueAndValidity();
   }
 
-  delete ($event) {
-    this.submitButton.submit($event);
-  }
-
   deletionCall() {
     if (this.deletionObserver) {
       this.deletionObserver().subscribe(