[pve-devel] r6330 - in pve-manager/pve2: . www/manager/grid

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-20 06:51:59 +0200 (Wed, 20 Jul 2011)
New Revision: 6330

Modified:
   pve-manager/pve2/ChangeLog
   pve-manager/pve2/www/manager/grid/ResourceGrid.js
Log:
 only include real children.



Modified: pve-manager/pve2/ChangeLog
===================================================================
--- pve-manager/pve2/ChangeLog	2011-07-19 10:54:03 UTC (rev 6329)
+++ pve-manager/pve2/ChangeLog	2011-07-20 04:51:59 UTC (rev 6330)
@@ -1,3 +1,8 @@
+2011-07-20  Proxmox Support Team  <support at proxmox.com>
+
+	* www/manager/grid/ResourceGrid.js (gather_child_nodes): only
+	include real children.
+
 2011-07-19  Proxmox Support Team  <support at proxmox.com>
 
 	* www/manager/qemu/NetworkEdit.js: add rate limit field

Modified: pve-manager/pve2/www/manager/grid/ResourceGrid.js
===================================================================
--- pve-manager/pve2/www/manager/grid/ResourceGrid.js	2011-07-19 10:54:03 UTC (rev 6329)
+++ pve-manager/pve2/www/manager/grid/ResourceGrid.js	2011-07-20 04:51:59 UTC (rev 6330)
@@ -80,17 +80,17 @@
 		len = cs.length,
                 i = 0, n, res;
 
-		var orgnode = rstore.data.get(cn.data.id);
-		if (orgnode) {
-		    if ((!filterfn || filterfn(cn)) &&
-			(!textfilter || textfilter_match(cn))) {
-			nodeidx[cn.data.id] = orgnode;
+                for (; i < len; i++) {
+		    var child = cs[i];
+		    var orgnode = rstore.data.get(child.data.id);
+		    if (orgnode) {
+			if ((!filterfn || filterfn(child)) &&
+			    (!textfilter || textfilter_match(child))) {
+			    nodeidx[child.data.id] = orgnode;
+			}
 		    }
+		    gather_child_nodes(child);
 		}
-	    
-                for (; i < len; i++) {
-		    gather_child_nodes(cs[i]);
-		}
 	    };
 	    gather_child_nodes(me.pveSelNode);