Skip to content
Permalink
Browse files

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

  • Loading branch information...
nlalonde committed Sep 10, 2019
1 parent 8239890 commit f0586ece3205dc0a117501527f682f18e5203be0
@@ -19,16 +19,18 @@ const VersionCheck = Discourse.Model.extend({

@computed("git_branch", "installed_sha")
gitLink(gitBranch, installedSHA) {
if (gitBranch) {
if (gitBranch && installedSHA) {
return `https://github.com/discourse/discourse/compare/${installedSHA}...${gitBranch}`;
} else {
} else if (installedSHA) {
return `https://github.com/discourse/discourse/tree/${installedSHA}`;
}
},

@computed("installed_sha")
shortSha(installedSHA) {
return installedSHA.substr(0, 10);
if (installedSHA) {
return installedSHA.substr(0, 10);
}
}
});

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

{{#if versionCheck.noCheckPerformed}}

0 comments on commit f0586ec

Please sign in to comment.
You can’t perform that action at this time.