From: Tiago Melo <tmelo@suse.com>
Date: Thu, 7 Jun 2018 10:59:13 +0000 (+0100)
Subject: mgr/dashboard: Fix pool usage not displaying on filesystem page
X-Git-Tag: v14.0.1~1161^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=22669872f1eacc382ea6158f9a83f6ffe9602889;p=ceph-ci.git

mgr/dashboard: Fix pool usage not displaying on filesystem page

Reference to the template was undefined during the init of the component.

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

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
index ac12cc95895..b19ab9f8e13 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
@@ -25,7 +25,6 @@
                     [columns]="pools.columns"
                     [toolHeader]="false">
           </cd-table>
-
         </fieldset>
       </div>
     </div>
@@ -36,25 +35,26 @@
         <cd-cephfs-chart [mdsCounter]="mdsCounter"></cd-cephfs-chart>
       </div>
     </div>
-
-    <!-- templates -->
-    <ng-template #poolUsageTpl
-                 let-row="row">
-      <cd-usage-bar [totalBytes]="row.size"
-                    [usedBytes]="row.used"></cd-usage-bar>
-    </ng-template>
-
-    <ng-template #activityTmpl
-                 let-row="row"
-                 let-value="value">
-      {{ row.state === 'standby-replay' ? 'Evts' : 'Reqs' }}: {{ value | dimless }} /s
-    </ng-template>
   </tab>
   <tab i18n-heading
        heading="Clients: {{ clientCount }}"
        (select)="clientsSelect=true"
        (deselect)="clientsSelect=false">
     <cd-cephfs-clients [id]="id"
-                *ngIf="clientsSelect"></cd-cephfs-clients>
+                       *ngIf="clientsSelect">
+    </cd-cephfs-clients>
   </tab>
 </tabset>
+
+<!-- templates -->
+<ng-template #poolUsageTpl
+             let-row="row">
+  <cd-usage-bar [totalBytes]="row.size"
+                [usedBytes]="row.used"></cd-usage-bar>
+</ng-template>
+
+<ng-template #activityTmpl
+             let-row="row"
+             let-value="value">
+  {{ row.state === 'standby-replay' ? 'Evts' : 'Reqs' }}: {{ value | dimless }} /s
+</ng-template>