[rhmessaging-commits] rhmessaging commits: r4235 - in mgmt/newdata/cumin: resources and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-08-26 17:41:26 -0400 (Thu, 26 Aug 2010)
New Revision: 4235

Modified:
   mgmt/newdata/cumin/python/cumin/grid/slot.py
   mgmt/newdata/cumin/resources/slots.swf
Log:
Fix for BZ 623677
- Disable the slot vis animations
- Fix the drilled down slot sort order to Activity+State, Name

Modified: mgmt/newdata/cumin/python/cumin/grid/slot.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/slot.py	2010-08-26 21:34:22 UTC (rev 4234)
+++ mgmt/newdata/cumin/python/cumin/grid/slot.py	2010-08-26 21:41:26 UTC (rev 4235)
@@ -270,9 +270,8 @@
         # leaf
         if level == len(groups):
             if leaves:
-                #for i in sorted(plist, key=lambda x:"%s%s%s" % 
-                #                (records[x]["Activity"], records[x]["State"], records[x]["Name"])):
-                for i in sorted(plist, key=lambda x: records[x]["Name"]):
+                for i in sorted(plist, key=lambda x:"%s%s%s" % 
+                                (records[x]["Activity"], records[x]["State"], records[x]["Name"])):
                     el = Element()
                     el.job_id = records[i]["JobId"] and records[i]["JobId"] or ""
                     el.activity = records[i]["Activity"] and records[i]["Activity"] or "Unknown"
@@ -287,7 +286,7 @@
                 if not expanded:
                     # display summary info for all the slots under this grouping
                     activityStates = self.get_activityStates(records, plist)
-                    for activityState in activityStates:
+                    for activityState in sorted(activityStates):
                         el = Element()
                         el.name = "slot_info"
                         el.a_s = activityState

Modified: mgmt/newdata/cumin/resources/slots.swf
===================================================================
(Binary files differ)