Fix issue where ups may be set to null under certain conditions. #12

kantlivelong · Mar 30, 2022 · 5d4cec9 · 5d4cec9
1 parent af03d83
commit 5d4cec9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/octoprint_ups/__init__.py b/octoprint_ups/__init__.py
@@ -236,7 +236,6 @@ def on_api_command(self, command, data):
                 res = ups.list_ups()
                 return jsonify(result=list(res.keys()))
             except:
-                # TODO: Can be done diff? idk?
                 return make_response("Error getting UPS list", 500)
 
 

diff --git a/octoprint_ups/static/js/ups.js b/octoprint_ups/static/js/ups.js
@@ -134,15 +134,18 @@ $(function() {
             }).done(function(data) {
                 console.log(data);
                 self.available_upses(data.result);
+            }).fail(function(data) {
+                console.warn("Failed fetching UPS list. Falling back to config value.");
+                alert("Unable to fetch UPS list.");
+
+                self.available_upses([self.settings.plugins.ups.ups()]);
             });
         };
 
         self.onBeforeBinding = function() {
             self.settings = self.settingsViewModel.settings;
-        };
 
-        self.onSettingsShown = function () {
-            self.updateUPSList();
+            self.available_upses([self.settings.plugins.ups.ups()]);
         };
 
         self.onDataUpdaterPluginMessage = function(plugin, data) {

diff --git a/octoprint_ups/templates/ups_settings.jinja2 b/octoprint_ups/templates/ups_settings.jinja2
@@ -36,7 +36,7 @@
     <div class="control-group">
         <label class="control-label">UPS</label>
         <div class="controls">
-            <select data-bind="options: available_upses, value: settings.plugins.ups.ups">
+            <select data-bind="options: available_upses, value: settings.plugins.ups.ups, click: function() { $root.updateUPSList(); }">
             </select>
             <a title="Refresh" href="#" data-bind="click: function() { $root.updateUPSList(); }">
                 <i class="icon-refresh"></i>