[Zenoss-commit] r6338 - in trunk/Products: ZenModel ZenWidgets/skins/zenui/flex

[<sv...@ze...>]

Author: ian
Date: 2007-08-31 17:45:45 -0400 (Fri, 31 Aug 2007)
New Revision: 6338

Modified:
   trunk/Products/ZenModel/DataRoot.py
   trunk/Products/ZenWidgets/skins/zenui/flex/ZenNetMap.mxml
   trunk/Products/ZenWidgets/skins/zenui/flex/ZenNetMap.swf
Log:
 * Fixes #895: Final bugfixes on the network map


Modified: trunk/Products/ZenModel/DataRoot.py
===================================================================
--- trunk/Products/ZenModel/DataRoot.py	2007-08-31 19:33:14 UTC (rev 6337)
+++ trunk/Products/ZenModel/DataRoot.py	2007-08-31 21:45:45 UTC (rev 6338)
@@ -549,7 +549,7 @@
         if not obj:
             obj = self.Networks.getNet(objid)
         if not obj:
-            raise NotImplementedError
+            return '<graph><Start name="%s"/></graph>' % objid
         return obj.getXMLEdges(int(depth), filter, 
                                start=(obj.id,obj.getPrimaryUrlPath()))
 

Modified: trunk/Products/ZenWidgets/skins/zenui/flex/ZenNetMap.mxml
===================================================================
--- trunk/Products/ZenWidgets/skins/zenui/flex/ZenNetMap.mxml	2007-08-31 19:33:14 UTC (rev 6337)
+++ trunk/Products/ZenWidgets/skins/zenui/flex/ZenNetMap.mxml	2007-08-31 21:45:45 UTC (rev 6338)
@@ -106,7 +106,6 @@
             [Bindable]private var _isFullScreen:Boolean = false;
             [Bindable]private var _selectedClass:String;
             [Bindable]private var _startingObject:String = getInitialObject();
-            [Bindable]private var _startUrl:String;
 
 			private function setup(): void {
 				initialData.send();
@@ -120,12 +119,14 @@
 				roamer.resetShowHide();
 				roamer.xmlNames = xmlNames;
                 _nodeList = XML(event.result);
+                //log(_nodeList.toXMLString());
                 var startobj:String = _nodeList.Start.@name;
-                var _startUrl:String = _nodeList.Start.@url;
+                //log(startobj);
                 _nodeList.replace('Start', "");
                 //roamer.dataProvider = _nodeList;
                 roamer.setDataProvider(_nodeList, startobj);
-                objidsearch.text = roamer.currentItem.data.@prop;
+                if (roamer.currentItem)
+                    objidsearch.text = roamer.currentItem.data.@prop;
 			}
 
             private function refreshData(): void {
@@ -135,7 +136,6 @@
 			private function updateData(event: ResultEvent): void {
                 var mylist:XMLList = XMLList(event.result);
                 var startobj:String = mylist.Start.@name;
-                var _startUrl:String = mylist.Start.@url;
                 var nodelist:XMLList = mylist.Node;
                 var edgelist:XMLList = mylist.Edge;
                 for each (var item:XML in nodelist) {

Modified: trunk/Products/ZenWidgets/skins/zenui/flex/ZenNetMap.swf
===================================================================
(Binary files differ)