From: Volker Theile <vtheile@suse.com>
Date: Mon, 13 Jan 2020 09:21:47 +0000 (+0100)
Subject: mgr/dashboard: Fix modals for Identifying Device and Editing OSD
X-Git-Tag: v15.1.0~142^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bda45225dc0afdd9e88ed6ffb09989441b96d119;p=ceph.git

mgr/dashboard: Fix modals for Identifying Device and Editing OSD

Fixes: https://tracker.ceph.com/issues/43544

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

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
index 89842cbf0fe..025615e496e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
@@ -344,7 +344,7 @@ export class OsdListComponent implements OnInit {
         }),
         fields: [
           {
-            type: 'inputText',
+            type: 'text',
             name: 'deviceClass',
             value: selectedOsd.tree.device_class,
             label: this.i18n('Device class'),
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
index a7c76941afd..ced902d67cf 100755
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.html
@@ -30,7 +30,7 @@
                      [name]="field.name"
                      [formControlName]="field.name"
                      cdDimlessBinary>
-              <select *ngIf="field.name === 'select'"
+              <select *ngIf="field.type === 'select'"
                       class="form-control custom-select"
                       [id]="field.name"
                       [formControlName]="field.name">
@@ -43,7 +43,7 @@
                   {{ option.text }}
                 </option>
               </select>
-              <span *ngIf="formGroup.showError(field.name,formDir)"
+              <span *ngIf="formGroup.showError(field.name, formDir)"
                     class="invalid-feedback">
                 {{ getError(field) }}
               </span>