diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index c1d1d820..137b9bc4 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -154,8 +154,8 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, "octoprint_stable_branch": dict(branch="master", name="Stable"), "octoprint_prerelease_branches": [ - dict(branch="rc/maintenance", name="Maintenance"), - dict(branch="rc/devel", name="Devel") + dict(branch="rc/maintenance", name="Maintenance RCs"), + dict(branch="rc/devel", name="Development RCs") ], "cache_ttl": 24 * 60, diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index ef0cc9c1..142ae8f8 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -112,16 +112,18 @@ $(function() { }; self._copyConfig = function() { + var availableReleaseChannels = []; + _.each(self.settings.settings.plugins.softwareupdate.octoprint_branch_mappings(), function(mapping) { + availableReleaseChannels.push({"key": mapping.branch(), "name": gettext(mapping.name() || mapping.branch())}); + }); + self.config_availableReleaseChannels(availableReleaseChannels); + self.config_cacheTtl(self.settings.settings.plugins.softwareupdate.cache_ttl()); self.config_checkoutFolder(self.settings.settings.plugins.softwareupdate.octoprint_checkout_folder()); self.config_checkType(self.settings.settings.plugins.softwareupdate.octoprint_type()); self.config_releaseChannel(self.settings.settings.plugins.softwareupdate.octoprint_release_channel()); - var availableReleaseChannels = []; - _.each(self.settings.settings.plugins.softwareupdate.octoprint_branch_mappings(), function(mapping) { - availableReleaseChannels.push({"key": mapping.branch, "name": gettext(mapping.name || mapping.branch)}); - }); - self.config_availableReleaseChannels(availableReleaseChannels); + log.info("releaseChannel:", self.config_releaseChannel(), ", availableReleaseChannels:", availableReleaseChannels); }; self.fromCheckResponse = function(data, ignoreSeen, showIfNothingNew) {