From: Volker Theile <vtheile@suse.com>
Date: Mon, 27 May 2019 09:39:29 +0000 (+0200)
Subject: mgr/dashboard: Fixing RGW user user/bucket quota info
X-Git-Tag: v15.1.0~2631^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28174%2Fhead;p=ceph.git

mgr/dashboard: Fixing RGW user user/bucket quota info

Display '-' if user/bucket quota is disabled instead of displaying the current set values.

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

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
index 304ce2327e9f..c58445e09508 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html
@@ -68,10 +68,12 @@
             <tr>
               <td i18n
                   class="bold col-sm-1">Maximum size</td>
-              <td *ngIf="user.user_quota.max_size <= -1"
+              <td *ngIf="!user.user_quota.enabled"
+                  class="col-sm-3">-</td>
+              <td *ngIf="user.user_quota.enabled && user.user_quota.max_size <= -1"
                   i18n
                   class="col-sm-3">Unlimited</td>
-              <td *ngIf="user.user_quota.max_size > -1"
+              <td *ngIf="user.user_quota.enabled && user.user_quota.max_size > -1"
                   class="col-sm-3">
                 {{ user.user_quota.max_size | dimlessBinary }}
               </td>
@@ -79,10 +81,12 @@
             <tr>
               <td i18n
                   class="bold col-sm-1">Maximum objects</td>
-              <td *ngIf="user.user_quota.max_objects <= -1"
+              <td *ngIf="!user.user_quota.enabled"
+                  class="col-sm-3">-</td>
+              <td *ngIf="user.user_quota.enabled && user.user_quota.max_objects <= -1"
                   i18n
                   class="col-sm-3">Unlimited</td>
-              <td *ngIf="user.user_quota.max_objects > -1"
+              <td *ngIf="user.user_quota.enabled && user.user_quota.max_objects > -1"
                   class="col-sm-3">
                 {{ user.user_quota.max_objects }}
               </td>
@@ -104,10 +108,12 @@
             <tr>
               <td i18n
                   class="bold col-sm-1">Maximum size</td>
-              <td *ngIf="user.bucket_quota.max_size <= -1"
+              <td *ngIf="!user.bucket_quota.enabled"
+                  class="col-sm-3">-</td>
+              <td *ngIf="user.bucket_quota.enabled && user.bucket_quota.max_size <= -1"
                   i18n
                   class="col-sm-3">Unlimited</td>
-              <td *ngIf="user.bucket_quota.max_size > -1"
+              <td *ngIf="user.bucket_quota.enabled && user.bucket_quota.max_size > -1"
                   class="col-sm-3">
                 {{ user.bucket_quota.max_size | dimlessBinary }}
               </td>
@@ -115,10 +121,12 @@
             <tr>
               <td i18n
                   class="bold col-sm-1">Maximum objects</td>
-              <td *ngIf="user.bucket_quota.max_objects <= -1"
+              <td *ngIf="!user.bucket_quota.enabled"
+                  class="col-sm-3">-</td>
+              <td *ngIf="user.bucket_quota.enabled && user.bucket_quota.max_objects <= -1"
                   i18n
                   class="col-sm-3">Unlimited</td>
-              <td *ngIf="user.bucket_quota.max_objects > -1"
+              <td *ngIf="user.bucket_quota.enabled && user.bucket_quota.max_objects > -1"
                   class="col-sm-3">
                 {{ user.bucket_quota.max_objects }}
               </td>