[rhmessaging-commits] rhmessaging commits: r4227 - in mgmt/newdata/cumin/python/cumin: inventory and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-08-26 10:39:22 -0400 (Thu, 26 Aug 2010)
New Revision: 4227

Modified:
   mgmt/newdata/cumin/python/cumin/grid/slot.strings
   mgmt/newdata/cumin/python/cumin/inventory/system.py
Log:
Fix for BZ 625060: Fixed exception when slot is clicked from inventory page in png vis.

Modified: mgmt/newdata/cumin/python/cumin/grid/slot.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/slot.strings	2010-08-26 13:32:59 UTC (rev 4226)
+++ mgmt/newdata/cumin/python/cumin/grid/slot.strings	2010-08-26 14:39:22 UTC (rev 4227)
@@ -766,9 +766,11 @@
 }())
 
 function go_to_slot(id) {
-    var branch = wooly.session.branch(show_slot_url);
-    branch[branch.frame + ".id"] = id;
-    window.location.href = branch.marshal();
+    if (show_slot_url != "") {
+        var branch = wooly.session.branch(show_slot_url);
+        branch[branch.frame + ".id"] = id;
+        window.location.href = branch.marshal();
+    }
 }
 function vis_clicked(slot) {
     go_to_slot(slot);

Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/inventory/system.py	2010-08-26 13:32:59 UTC (rev 4226)
+++ mgmt/newdata/cumin/python/cumin/inventory/system.py	2010-08-26 14:39:22 UTC (rev 4227)
@@ -102,6 +102,9 @@
 
         return sess.marshal()
 
+    def render_slot_url(self, session):
+        return ""
+
     def get_scheduler_select(self, session):
         system = self.system.get(session)
         return "system='%s'" % system.nodeName