pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display remote version in update message, not local one...

Browse source
This commit is contained in:
Gina Häußge 2015-12-10 17:12:02 +01:00
parent 8149a3b4a8
commit 1a4920fc36
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
View file

@ -129,7 +129,14 @@ $(function() {
value.releaseNotes = undefined;
}
value.fullName = _.sprintf(gettext("%(displayName)s: %(displayVersion)s"), value);
var fullNameTemplate = gettext("%(name)s: %(version)s");
value.fullNameLocal = _.sprintf(fullNameTemplate, {name: value.displayName, version: value.displayVersion});
var fullNameRemoteVars = {name: value.displayName, version: gettext("unknown")};
if (value.hasOwnProperty("information") && value.information.hasOwnProperty("remote") && value.information.remote.hasOwnProperty("name")) {
fullNameRemoteVars.version = value.information.remote.name;
}
value.fullNameRemote = _.sprintf(fullNameTemplate, fullNameRemoteVars);
versions.push(value);
});
@ -162,7 +169,7 @@ $(function() {
if (update_info.updateAvailable) {
text += "<li>"
+ "<i class='icon-li " + (update_info.updatePossible ? "icon-ok" : "icon-remove")+ "'></i>"
+ "<span class='name' title='" + update_info.fullName + "'>" + update_info.fullName + "</span>"
+ "<span class='name' title='" + update_info.fullNameRemote + "'>" + update_info.fullNameRemote + "</span>"
+ (update_info.releaseNotes ? "<a href=\"" + update_info.releaseNotes + "\" target=\"_blank\">" + gettext("Release Notes") + "</a>" : "")
+ "</li>";
}

2
src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2
View file

@ -10,7 +10,7 @@
<ul>
<!-- ko foreach: availableAndPossible -->
<li>
<span class="name" data-bind="text: fullName, attr: {title: fullName}"></span>
<span class="name" data-bind="text: fullNameRemote, attr: {title: fullNameRemote}"></span>
<div class="releaseNotes" data-bind="visible: releaseNotes"><a data-bind="attr: {href: releaseNotes}">{{ _('Release Notes') }}</a></div>
</li>
<!-- /ko -->