[rhmessaging-commits] rhmessaging commits: r1511 - in mgmt: notes and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-17 17:51:27 -0500 (Mon, 17 Dec 2007)
New Revision: 1511

Modified:
   mgmt/cumin/python/cumin/queue.py
   mgmt/cumin/python/cumin/widgets.py
   mgmt/notes/justin-todo.txt
Log:
Renames get_column_name to get_data_name to avoid confusion.



Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-12-17 22:42:13 UTC (rev 1510)
+++ mgmt/cumin/python/cumin/queue.py	2007-12-17 22:51:27 UTC (rev 1511)
@@ -68,7 +68,7 @@
             return "%s Enqueued" % self.header.parent().get_unit_plural \
                 (session)
 
-        def get_column_name(self, session):
+        def get_data_name(self, session):
             if self.header.parent().unit.get(session) == "b":
                 return QueueStats.q.byteTotalEnqueues
             else:
@@ -79,7 +79,7 @@
             return "%s Dequeued" % self.header.parent().get_unit_plural \
                 (session)
 
-        def get_column_name(self, session):
+        def get_data_name(self, session):
             if self.header.parent().unit.get(session) == "b":
                 return QueueStats.q.byteTotalDequeues
             else:
@@ -89,7 +89,7 @@
         def get_title(self, session):
             return "%s Depth" % self.header.parent().get_unit_singular(session)
 
-        def get_column_name(self, session):
+        def get_data_name(self, session):
             if self.header.parent().unit.get(session) == "b":
                 return QueueStats.q.byteDepth
             else:

Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py	2007-12-17 22:42:13 UTC (rev 1510)
+++ mgmt/cumin/python/cumin/widgets.py	2007-12-17 22:51:27 UTC (rev 1511)
@@ -362,16 +362,16 @@
 
 # XXX for now, not a Widget
 class TableColumn(object):
-    def __init__(self, name, column_name=None, title=None, class_=None):
+    def __init__(self, name, data_name=None, title=None, class_=None):
         self.name = name
-        self.column_name = column_name
+        self.data_name = data_name
         self.title = title
         self.class_ = class_
 
         self.header = None
 
-    def get_column_name(self, session):
-        return self.column_name
+    def get_data_name(self, session):
+        return self.data_name
 
     def get_title(self, session):
         return self.title
@@ -386,11 +386,11 @@
         return classes
 
     def get_sorted_items(self, session, items):
-        name = self.get_column_name(session)
+        name = self.get_data_name(session)
 
         if name:
             # XXX sqlobject specific
-            items = items.orderBy(self.get_column_name(session))
+            items = items.orderBy(self.get_data_name(session))
 
         return items
 

Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt	2007-12-17 22:42:13 UTC (rev 1510)
+++ mgmt/notes/justin-todo.txt	2007-12-17 22:51:27 UTC (rev 1511)
@@ -39,6 +39,8 @@
 
 Deferred
 
+ * Add [None] to groups field in broker view
+
  * Go back to Widget.parent as an attr, not a function
 
  * Indicate how old stats are