From: Ernesto Puerta <epuertat@redhat.com>
Date: Mon, 13 Jul 2020 15:32:54 +0000 (+0200)
Subject: mgr/dashboard: fix backporting issue #35926
X-Git-Tag: v15.2.5~138^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfe8ebabdb6497ea61ced5d01c4cf16fe4653ed6;p=ceph.git

mgr/dashboard: fix backporting issue #35926

Incorrect conflict-solving during backporting of https://github.com/ceph/ceph/pull/34606
to Octopus (https://github.com/ceph/ceph/pull/35926) led to deletion of
some chuncks in OSD list page.

Fixes: https://tracker.ceph.com/issues/46502
Fixes: https://github.com/ceph/ceph/pull/35926
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
index 56cb2ca60f71..55d0e0219360 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
@@ -68,6 +68,27 @@
                     i18n>The {selection.hasSingleSelection, select, true {OSD is} false {OSDs are}} not safe to be
       {{ actionDescription }}! {{ message }}</cd-alert-panel>
   </div>
-  <ng-container i18n><strong>OSD {{ getSelectedOsdIds() | join }}</strong> will be
+  <ng-container i18n><strong>OSD {{ osdIds | join }}</strong> will be
   <strong>{{ actionDescription }}</strong> if you proceed.</ng-container>
 </ng-template>
+
+<ng-template #deleteOsdExtraTpl
+             let-form="form">
+  <ng-container [formGroup]="form">
+    <ng-container formGroupName="child">
+      <div class="form-group">
+        <div class="custom-control custom-checkbox">
+          <input type="checkbox"
+                 class="custom-control-input"
+                 name="preserve"
+                 id="preserve"
+                 formControlName="preserve"
+                 autofocus>
+          <label class="custom-control-label"
+                 for="preserve"
+                 i18n>Preserve OSD ID(s) for replacement.</label>
+        </div>
+      </div>
+    </ng-container>
+  </ng-container>
+</ng-template>