Merge branch 'develop' into eflumerf/RemoveUPS

art-daq · Feb 17, 2025 · b6e7536 · b6e7536
2 parents e1cb022 + dab9b88
commit b6e7536
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/WebGUI/html/Iterate.html b/WebGUI/html/Iterate.html
@@ -1120,15 +1120,18 @@
                 												if(targetChildren[m].nodeName == "node")
                 												{
                 													if(targetCount++) targetCSVStr += ",";
+
+																	var targetChildrenChildren = targetChildren[m].getElementsByTagName("node");
+
                 													//found target record
                 													//	second record is link
                 													//		first two nodes are uid and table
                 													targetCSVStr += 
-                															targetChildren[m].children[1].getElementsByTagName(
+																			targetChildrenChildren[1].getElementsByTagName(
                 																	"LinkTableName")[0].getAttribute("value") +
 																					"/" + 
-																					targetChildren[m].children[1].getElementsByTagName(
-																							"UID")[0].getAttribute("value");                                                            	
+																			targetChildrenChildren[1].getElementsByTagName(
+																					"UID")[0].getAttribute("value");                                                            	
                 												}
                 											} //end target loop
 
@@ -1166,7 +1169,8 @@
                 } //end try
                 catch(e)
                 {
-                	Debug.log("Invalid iteration plan loaded: " + e);
+                	Debug.err("Invalid or corrupt iteration plan '" + plan + 
+						"' loaded (please notify admins): " + e);
                 	_commands = []; //clear
                 }
 

diff --git a/WebGUI/js/Desktop.js b/WebGUI/js/Desktop.js
@@ -205,6 +205,8 @@ Desktop.createDesktop = function(security) {
 		_desktopElement.style.height = (window.innerHeight-_desktopElement.offsetTop) + "px";
 		_desktopElement.style.width = (window.innerWidth-_desktopElement.offsetLeft) + "px";
         if(!_dashboard) return; //initial calls dashboard might not be defined
+		Debug.log("_handleDesktopResize()");
+
         _dashboard.redrawDashboard();
         if(_login) _login.redrawLogin();
         if(_icons) _icons.redrawIcons();