Author: justi9
Date: 2007-11-05 11:56:24 -0500 (Mon, 05 Nov 2007)
New Revision: 1233
Modified:
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/wooly/__init__.py
mgmt/notes/justin-todo.txt
Log:
Fixes a bug to do with parameter resolution across pages. The bug
showed up when I added exchange forms.
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-11-05 15:49:48 UTC (rev 1232)
+++ mgmt/cumin/python/cumin/queue.py 2007-11-05 16:56:24 UTC (rev 1233)
@@ -471,6 +471,6 @@
def __init__(self, app, name):
super(QueueChartPage, self).__init__(app, name)
- self.param = QueueParameter(app, "id")
- self.add_parameter(self.param)
- self.set_object_parameter(self.param)
+ self.queue = QueueParameter(app, "id")
+ self.add_parameter(self.queue)
+ self.set_object_parameter(self.queue)
Modified: mgmt/cumin/python/wooly/__init__.py
===================================================================
--- mgmt/cumin/python/wooly/__init__.py 2007-11-05 15:49:48 UTC (rev 1232)
+++ mgmt/cumin/python/wooly/__init__.py 2007-11-05 16:56:24 UTC (rev 1233)
@@ -370,16 +370,16 @@
self.parameters.append(param)
- def get_parameter(self, key):
+ def get_parameter(self, page, key):
if not self.parameter_index:
index = dict()
for param in self.parameters:
- index[param.path()] = param
+ index[(param.widget.page(), param.path())] = param
self.parameter_index = index
- return self.parameter_index.get(key)
+ return self.parameter_index.get((page, key))
def add_resource_dir(self, dir):
self.finder.add_dir(dir)
@@ -572,7 +572,7 @@
key, svalue = var.split("=")
value = unquote_plus(svalue)
- param = self.app.get_parameter(key)
+ param = self.app.get_parameter(self.get_page(), key)
if param:
param.add(self, param.unmarshal(value))
Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt 2007-11-05 15:49:48 UTC (rev 1232)
+++ mgmt/notes/justin-todo.txt 2007-11-05 16:56:24 UTC (rev 1233)
@@ -6,6 +6,8 @@
* Queue: Add created, deleted, updated timestamps
+ * Fix the broken charts
+
Deferred
* Queue: Add a msg enq rate msg deq rate chart