IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: errors in qunit tests when version check info is missing

Browse Source
This commit is contained in:
Neil Lalonde 2019-09-10 16:38:23 -04:00
parent 82398907af
commit f0586ece32
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/models/version-check.js.es6
View File

@ -19,16 +19,18 @@ const VersionCheck = Discourse.Model.extend({
@computed("git_branch", "installed_sha") @computed("git_branch", "installed_sha")
gitLink(gitBranch, installedSHA) { gitLink(gitBranch, installedSHA) {
if (gitBranch) { if (gitBranch && installedSHA) {
return `https://github.com/discourse/discourse/compare/${installedSHA}...${gitBranch}`; return `https://github.com/discourse/discourse/compare/${installedSHA}...${gitBranch}`;
} else { } else if (installedSHA) {
return `https://github.com/discourse/discourse/tree/${installedSHA}`; return `https://github.com/discourse/discourse/tree/${installedSHA}`;
} }
}, },
@computed("installed_sha") @computed("installed_sha")
shortSha(installedSHA) { shortSha(installedSHA) {
return installedSHA.substr(0, 10); if (installedSHA) {
return installedSHA.substr(0, 10);
}
} }
}); });

8
app/assets/javascripts/admin/templates/version-checks.hbs
View File

@ -6,9 +6,11 @@
<div class="version-number"> <div class="version-number">
<h4>{{i18n 'admin.dashboard.installed_version'}}</h4> <h4>{{i18n 'admin.dashboard.installed_version'}}</h4>
<h3>{{dash-if-empty versionCheck.installed_version}}</h3> <h3>{{dash-if-empty versionCheck.installed_version}}</h3>
<div class="sha-link"> {{#if versionCheck.gitLink}}
(<a href={{versionCheck.gitLink}} target="_blank">{{versionCheck.shortSha}}</a>) <div class="sha-link">
</div> (<a href={{versionCheck.gitLink}} target="_blank">{{versionCheck.shortSha}}</a>)
</div>
{{/if}}
</div> </div>
{{#if versionCheck.noCheckPerformed}} {{#if versionCheck.noCheckPerformed}}