From: Tiago Melo <tmelo@suse.com>
Date: Thu, 11 Jul 2019 17:46:15 +0000 (+0000)
Subject: mgr/dashboard: Fix form validation problems in RGW user form
X-Git-Tag: v15.1.0~2224^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29000%2Fhead;p=ceph.git

mgr/dashboard: Fix form validation problems in RGW user form

ng-bootstrap-form-validation requires that every "form-control" has
an associated "formControlName".

Since these didn't had one, we had to either removed the "form-control" class
or rename it to "cd-form-control" (which will apply the same style without
triggering the validation).

Signed-off-by: Tiago Melo <tmelo@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
index 517c990ef8f..8d3231d1420 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
@@ -202,7 +202,7 @@
           <div class="row">
             <div class="offset-sm-3 col-sm-9">
               <span *ngIf="subusers.length === 0"
-                    class="form-control no-border">
+                    class="no-border">
                 <span class="form-text text-muted"
                       i18n>There are no subusers.</span>
               </span>
@@ -215,7 +215,7 @@
                     </span>
                   </div>
                   <input type="text"
-                         class="form-control"
+                         class="cd-form-control"
                          value="{{ subuser.id }}"
                          readonly>
                   <div class="input-group-prepend"
@@ -225,7 +225,7 @@
                     </span>
                   </div>
                   <input type="text"
-                         class="form-control"
+                         class="cd-form-control"
                          value="{{ ('full-control' === subuser.permissions) ? 'full' : subuser.permissions }}"
                          readonly>
                   <span class="input-group-append">
@@ -274,7 +274,7 @@
                    i18n>S3</label>
             <div class="col-sm-9">
               <span *ngIf="s3Keys.length === 0"
-                    class="form-control no-border">
+                    class="no-border">
                 <span class="form-text text-muted"
                       i18n>There are no keys.</span>
               </span>
@@ -287,7 +287,7 @@
                     </div>
                   </div>
                   <input type="text"
-                         class="form-control"
+                         class="cd-form-control"
                          value="{{ key.user }}"
                          readonly>
                   <span class="input-group-append">
@@ -335,7 +335,7 @@
 
             <div class="col-sm-9">
               <span *ngIf="swiftKeys.length === 0"
-                    class="form-control no-border">
+                    class="no-border">
                 <span class="form-text text-muted"
                       i18n>There are no keys.</span>
               </span>
@@ -348,7 +348,7 @@
                     </span>
                   </div>
                   <input type="text"
-                         class="form-control"
+                         class="cd-form-control"
                          value="{{ key.user }}"
                          readonly>
                   <span class="input-group-append">
@@ -374,7 +374,7 @@
           <div class="form-group row">
             <div class="offset-sm-3 col-sm-9">
               <span *ngIf="capabilities.length === 0"
-                    class="form-control no-border">
+                    class="no-border">
                 <span class="form-text text-muted"
                       i18n>There are no capabilities.</span>
               </span>
@@ -387,7 +387,7 @@
                     </div>
                   </span>
                   <input type="text"
-                         class="form-control"
+                         class="cd-form-control"
                          value="{{ cap.type }}:{{ cap.perm }}"
                          readonly>
                   <span class="input-group-append">