[rhmessaging-commits] rhmessaging commits: r4347 - mgmt/newdata/cumin/python/cumin/grid.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-09-27 11:14:39 -0400 (Mon, 27 Sep 2010)
New Revision: 4347

Modified:
   mgmt/newdata/cumin/python/cumin/grid/negotiator.py
Log:
Avoid exception when the get group names call succeeds, but the get values doesn't complete before the page updates. 

Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/negotiator.py	2010-09-27 13:56:47 UTC (rev 4346)
+++ mgmt/newdata/cumin/python/cumin/grid/negotiator.py	2010-09-27 15:14:39 UTC (rev 4347)
@@ -245,13 +245,16 @@
         def render_content(self, session, group):
             value = self.parent.group_helper.get_config_value(session, group, "GROUP_QUOTA_DYNAMIC")
             self.task.form.group_leader.set(session, group)
-            if not "loading" in value:
-                href = self.task.get_href(session)
-                content = "%s%%" % str(round(float(value) * 100.0, 2))
-                return fmt_link(href, content, "", "", self.fmt_hover(""))
-            else:
-                return value
+            try:
+                if "loading" in value:
+                    return value
+            except TypeError:
+                pass
 
+            href = self.task.get_href(session)
+            content = "%s%%" % str(round(float(value) * 100.0, 2))
+            return fmt_link(href, content, "", "", self.fmt_hover(""))
+
     class SpacerColumn(ItemTableColumn):
         def render_title(self, session, *args):
             return ""
@@ -384,7 +387,7 @@
                 info = self.get_config_for_groups(session, config, [group])
                 return info[group][config]
             except:
-                return "loading"
+                return "<em>loading</em>"
 
     def get_unclaimed_dyn_quota(self, session, groups):
         info = self.get_config_info(session)