github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 04:47:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: shows disk usage even if no backups taken (#6189)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2018-07-26 18:38:55 -04:00
committed by GitHub
parent c115ace272
commit 59684adc43
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin-dashboard-next-general.js.es6
View File

@ -28,7 +28,7 @@ export default Ember.Controller.extend(PeriodComputationMixin, {
lastBackupTakenAt: Ember.computed.alias( lastBackupTakenAt: Ember.computed.alias(
"model.attributes.last_backup_taken_at" "model.attributes.last_backup_taken_at"
), ),
shouldDisplayDurability: Ember.computed.and("lastBackupTakenAt", "diskSpace"), shouldDisplayDurability: Ember.computed.and("diskSpace"),
@computed @computed
topReferredTopicsTopions() { topReferredTopicsTopions() {

3
app/assets/javascripts/admin/templates/dashboard_next_general.hbs
View File

@ -132,8 +132,11 @@
</h3> </h3>
<p> <p>
{{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}}) {{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}})
{{#if lastBackupTakenAt}}
<br /> <br />
{{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}} {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
{{/if}}
</p> </p>
</div> </div>
{{/if}} {{/if}}