From 486f3f279df8e0eb4b88d57c3fabc3dc061a4899 Mon Sep 17 00:00:00 2001
From: Patrick Nawracay <pnawracay@suse.com>
Date: Sat, 13 Oct 2018 22:58:36 +0200
Subject: [PATCH] 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>
---
 .../configuration-form/configuration-form.component.html        | 2 +-
 .../configuration-form/configuration-form.component.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 ea467161a3089..e2025fc33c17e 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 53e059ffbe0c4..b383eaa00270a 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);
-- 
2.39.5