Author: croberts
Date: 2012-05-16 18:23:13 +0000 (Wed, 16 May 2012)
New Revision: 5379
Modified:
trunk/cumin/python/cumin/grid/negotiator.py
Log:
Addressing BZ 760567. As part of the change to non-flash-based charting, the mechanism to
load the quota page changed. That seems to have fixed this BZ. This commit is to remove
some code that is no longer called (the code that caused the exception in this BZ) and to
add some log messages in the event that a similar condition affects the new code.
Modified: trunk/cumin/python/cumin/grid/negotiator.py
===================================================================
--- trunk/cumin/python/cumin/grid/negotiator.py 2012-05-15 20:01:00 UTC (rev 5378)
+++ trunk/cumin/python/cumin/grid/negotiator.py 2012-05-16 18:23:13 UTC (rev 5379)
@@ -281,7 +281,7 @@
try:
dynamic_groups = ["%s" % x for x in groups if
info[x]["GROUP_QUOTA_DYNAMIC"] != ""]
except:
- pass
+ log.error("Error when loading dynamic group values for quota
editing.")
for group in sorted(groups):
if(group in dynamic_groups):
values.append(self.render_quota_value(session, group))
@@ -300,7 +300,7 @@
try:
dynamic_groups = ["%s" % x for x in groups if
info[x]["GROUP_QUOTA_DYNAMIC"] != ""]
except:
- pass
+ log.error("Error when loading dynamic group names for quota
editing.")
for group in sorted(groups):
if(group in dynamic_groups):
values.append(group)
@@ -319,7 +319,7 @@
try:
dynamic_groups = ["%s" % x for x in groups if
info[x]["GROUP_QUOTA_DYNAMIC"] != ""]
except:
- pass
+ log.error("Error when loading dynamic groups for quota editing.")
for group in sorted(groups):
if(group in dynamic_groups):
self.field_tmpl.render(writer, session, group)
@@ -416,27 +416,6 @@
def render_height(self, session):
return 210
- def get_href_params(self, session):
- params = super(PriorityPieChart, self).get_href_params(session)
- params.append("width=%i" % self.render_width(session))
- params.append("height=%i" % self.render_height(session))
-
- # send the group names and values to the chart page so we
- # don't have to get them again
- group_leader = self.group_leader.get(session)
- groups = self.group_helper.get_siblings(session, group_leader)
- info = self.group_helper.get_config_info(session)
- names = ["name=%s" % x for x in groups if
info[x]["GROUP_QUOTA_DYNAMIC"] != ""]
- params.extend(names)
- params.append("name=Unclaimed")
-
- vals = ["value=%s" % info[x]["GROUP_QUOTA_DYNAMIC"] for x in
groups if info[x]["GROUP_QUOTA_DYNAMIC"] != ""]
- params.extend(vals)
- unclaimed = self.group_helper.get_unclaimed_dyn_quota(session, groups)
- params.append("value=%s" % str(unclaimed))
-
- return params
-
class NegotiatorGroupTask(ObjectFrameTask):
def do_exit(self, session):
self.app.main_page.main.grid.view.show(session)
Show replies by date