FIX: fixes last backup/last_update dates (#6242)

discourse · Aug 7, 2018 · 67ec81b · 67ec81b · discoursebot · Aug 7, 2018
1 parent 56d3e07
commit 67ec81b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 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
@@ -84,12 +84,16 @@ export default Ember.Controller.extend(PeriodComputationMixin, {
 
   @computed("model.attributes.updated_at")
   updatedTimestamp(updatedAt) {
-    return moment(updatedAt).format("LLL");
+    return moment(updatedAt)
+      .tz(moment.tz.guess())
+      .format("LLL");
   },
 
   @computed("lastBackupTakenAt")
   backupTimestamp(lastBackupTakenAt) {
-    return moment(lastBackupTakenAt).format("LLL");
+    return moment(lastBackupTakenAt)
+      .tz(moment.tz.guess())
+      .format("LLL");
   },
 
   _reportsForPeriodURL(period) {

diff --git a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
@@ -138,8 +138,8 @@
             <h4>{{i18n "admin.dashboard.last_updated"}} </h4>
             <p>{{updatedTimestamp}}</p>
                <a rel="noopener" target="_blank" href="https://meta.discourse.org/tags/release-notes" class="btn">
-            {{i18n "admin.dashboard.whats_new_in_discourse"}}
-                    </a>
+                 {{i18n "admin.dashboard.whats_new_in_discourse"}}
+                </a>
             </div>
           </div>
         </div>

diff --git a/app/controllers/admin/dashboard_next_controller.rb b/app/controllers/admin/dashboard_next_controller.rb
@@ -27,7 +27,7 @@ def general
   private
 
   def last_backup_taken_at
-    if last_backup = Backup.all.last
+    if last_backup = Backup.all.first
       File.ctime(last_backup.path).utc
     end
   end