From: Patrick Nawracay <pnawracay@suse.com>
Date: Sat, 13 Oct 2018 20:58:36 +0000 (+0200)
Subject: mgr/dashboard: Save button doesn't prevent saving an invalid form
X-Git-Tag: v14.0.1~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24577%2Fhead;p=ceph.git

mgr/dashboard: Save button doesn't prevent saving an invalid form

Fixes: http://tracker.ceph.com/issues/36426

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
index ea467161a308..e2025fc33c17 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.html
@@ -101,7 +101,7 @@
         </div>
 
         <!-- Values -->
-        <div class="col-sm-12">
+        <div class="col-sm-12" formGroupName="values">
           <h2 i18n
               class="page-header">Values</h2>
           <div class="row" *ngFor="let section of availSections">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts
index 53e059ffbe0c..b383eaa00270 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts
@@ -49,7 +49,7 @@ export class ConfigurationFormComponent implements OnInit {
     };
 
     this.availSections.forEach((section) => {
-      formControls.values.controls[section] = new FormControl(null);
+      formControls.values.addControl(section, new FormControl(null));
     });
 
     this.configForm = new CdFormGroup(formControls);