From 59684adc432553e85b6aadc70a14a18722cd11c6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 26 Jul 2018 18:38:55 -0400
Subject: [PATCH] FIX: shows disk usage even if no backups taken (#6189)

---
 .../admin/controllers/admin-dashboard-next-general.js.es6  | 2 +-
 .../javascripts/admin/templates/dashboard_next_general.hbs | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6
index 42bdcc78241..878af5c4aa2 100644
--- a/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6
@@ -28,7 +28,7 @@ export default Ember.Controller.extend(PeriodComputationMixin, {
   lastBackupTakenAt: Ember.computed.alias(
     "model.attributes.last_backup_taken_at"
   ),
-  shouldDisplayDurability: Ember.computed.and("lastBackupTakenAt", "diskSpace"),
+  shouldDisplayDurability: Ember.computed.and("diskSpace"),
 
   @computed
   topReferredTopicsTopions() {
diff --git a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
index 71e43a2ef21..17b3c56d049 100644
--- a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
@@ -132,8 +132,11 @@
                   </h3>
                   <p>
                     {{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}})
-                    <br />
-                    {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
+
+                    {{#if lastBackupTakenAt}}
+                      <br />
+                      {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
+                    {{/if}}
                   </p>
                 </div>
               {{/if}}