Fix release error due to later loading of extruder settings

smartin015 · Apr 27, 2024 · adc9112 · adc9112
1 parent bfb2c13
commit adc9112
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/continuousprint/static/js/continuousprint_viewmodel.js b/continuousprint/static/js/continuousprint_viewmodel.js
@@ -32,7 +32,14 @@ function CPViewModel(parameters) {
     self.printerProfiles = parameters[3];
     self.settings = parameters[4];
     self.cpPrinterProfiles = CP_PRINTER_PROFILES;
-    self.extruders = ko.computed(function() { return self.printerProfiles.currentProfileData().extruder.count(); });
+    self.extruders = ko.computed(function() {
+        let cpd = self.printerProfiles.currentProfileData();
+        if (cpd) {
+            return cpd.extruder.count();
+        } else {
+            return 1;
+        }
+    });
     self.status = ko.observable("Initializing...");
     self.statusType = ko.observable("INIT");
     self.active = ko.observable(false);
@@ -358,6 +365,9 @@ function CPViewModel(parameters) {
       self.badMaterialCount(nbad);
       self.hasSpoolManager(true);
     }, function(statusCode, errText) {
+      if (statusCode !== 404) {
+        console.error(statusCode, errText);
+      }
       self.hasSpoolManager(statusCode !== 404);
     });
 

diff --git a/continuousprint/templates/continuousprint_tab.jinja2 b/continuousprint/templates/continuousprint_tab.jinja2
@@ -264,7 +264,7 @@
                           Hint: Install the <a href="https://plugins.octoprint.org/plugins/SpoolManager/" target="_blank">SpoolManager</a> plugin to enable <a href="https://smartin015.github.io/continuousprint/material-selection/" target="_blank">material selection</a>.
                           </div>
                           <div class="hint" data-bind="visible: $root.hasSpoolManager() && $root.materials().length == 0">
-                          Hint: Add spools, then reload to enable <a href="https://smartin015.github.io/continuousprint/material-selection/" target="_blank">material selection</a>.
+                          Hint: Add spools with materials, then reload to enable <a href="https://smartin015.github.io/continuousprint/material-selection/" target="_blank">material selection</a>.
                           </div>
                           <button class="btn pull-right" data-bind="click: remove" title="delete set">
                             <i style="cursor: pointer" class="far fa-trash-alt"></i> Delete