From: Volker Theile <vtheile@suse.com>
Date: Fri, 31 Aug 2018 16:49:45 +0000 (+0200)
Subject: mgr/dashboard: Display RGW user/bucket quota max size in human readable form
X-Git-Tag: v13.2.2~24^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24047%2Fhead;p=ceph.git

mgr/dashboard: Display RGW user/bucket quota max size in human readable form

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

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 8311e4b6f5db5391b535f7d19c60bbd621978239)
---

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 93ba8f446054..5c852d55c152 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
@@ -486,7 +486,8 @@
               <input id="user_quota_max_size"
                      class="form-control"
                      type="text"
-                     formControlName="user_quota_max_size">
+                     formControlName="user_quota_max_size"
+                     cdDimlessBinary>
               <span class="help-block"
                     *ngIf="(frm.submitted || userForm.controls.user_quota_max_size.dirty) && userForm.controls.user_quota_max_size.hasError('required')"
                     i18n>
@@ -589,7 +590,8 @@
               <input id="bucket_quota_max_size"
                      class="form-control"
                      type="text"
-                     formControlName="bucket_quota_max_size">
+                     formControlName="bucket_quota_max_size"
+                     cdDimlessBinary>
               <span class="help-block"
                     *ngIf="(frm.submitted || userForm.controls.bucket_quota_max_size.dirty) && userForm.controls.bucket_quota_max_size.hasError('required')"
                     i18n>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts
index d3a44f642d6f..850303bd2b30 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts
@@ -179,7 +179,7 @@ export class RgwUserFormComponent implements OnInit {
               value[type + '_quota_max_size'] = null;
             } else {
               value[type + '_quota_max_size_unlimited'] = false;
-              value[type + '_quota_max_size'] = quota.max_size;
+              value[type + '_quota_max_size'] = `${quota.max_size} B`;
             }
             if (quota.max_objects < 0) {
               value[type + '_quota_max_size_unlimited'] = true;