osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REFACTOR: Avoid duplicated logic on server and client.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-11-21 17:01:27 +08:00
parent c390169b71
commit f7642e076d
6 changed files with 64 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/models/version-check.js.es6
-12
View File
@@ -8,18 +8,6 @@ const VersionCheck = Discourse.Model.extend({
return updatedAt === null;
},
@computed('updated_at', 'version_check_pending')
dataIsOld(updatedAt, versionCheckPending) {
return versionCheckPending || moment().diff(moment(updatedAt), 'hours') >= 48;
},
@computed('dataIsOld', 'installed_version', 'latest_version', 'missing_versions_count')
staleData(dataIsOld, installedVersion, latestVersion, missingVersionsCount) {
return dataIsOld ||
(installedVersion !== latestVersion && missingVersionsCount === 0) ||
(installedVersion === latestVersion && missingVersionsCount !== 0);
},
@computed('missing_versions_count')
upToDate(missingVersionsCount) {
return missingVersionsCount === 0 || missingVersionsCount === null;
app/assets/javascripts/admin/templates/version-checks.hbs
+1 -1
View File
@@ -24,7 +24,7 @@
<span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
</td>
{{else}}
{{#if versionCheck.staleData}}
{{#if versionCheck.stale_data}}
<td class="version-number">{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</td>
<td class="face">
{{#if versionCheck.version_check_pending}}