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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-04-07 13:30:14 -0400 (Mon, 07 Apr 2008)
New Revision: 1849

Modified:
   mgmt/cumin/python/cumin/brokercluster.py
   mgmt/cumin/python/cumin/brokerprofile.py
   mgmt/cumin/python/cumin/widgets.py
   mgmt/notes/justin-todo.txt
Log:
Get rid of SQLObjectItemSet.  Code should now use ItemSet or SqlTable.



Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py	2008-04-07 17:23:08 UTC (rev 1848)
+++ mgmt/cumin/python/cumin/brokercluster.py	2008-04-07 17:30:14 UTC (rev 1849)
@@ -12,7 +12,7 @@
 
 strings = StringCatalog(__file__)
 
-class BrokerClusterSet(SQLObjectItemSet):
+class BrokerClusterSet(ItemSet):
     def render_cluster_add_href(self, session, *args):
         branch = session.branch()
         self.page.show_broker_cluster_add(branch)

Modified: mgmt/cumin/python/cumin/brokerprofile.py
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.py	2008-04-07 17:23:08 UTC (rev 1848)
+++ mgmt/cumin/python/cumin/brokerprofile.py	2008-04-07 17:30:14 UTC (rev 1849)
@@ -11,7 +11,7 @@
 
 strings = StringCatalog(__file__)
 
-class BrokerProfileSet(SQLObjectItemSet):
+class BrokerProfileSet(object):
     def render_profile_add_href(self, session, *args):
         branch = session.branch()
         self.page.show_broker_profile_add(branch)

Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py	2008-04-07 17:23:08 UTC (rev 1848)
+++ mgmt/cumin/python/cumin/widgets.py	2008-04-07 17:30:14 UTC (rev 1849)
@@ -424,16 +424,6 @@
     def get_bounds(self, session):
         return self.paginator.get_bounds(session)
 
-class SQLObjectItemSet(ItemSet):
-    def get_item_count(self, session, *args):
-        items = self.get_items(session, *args)
-
-        if isinstance(items, SelectResults):
-            return items.count()
-        else:
-            return super(SQLObjectItemSet, self).get_item_count \
-                (session, *args)
-
 class BrokerGroupInput(OptionInputSet):
     def __init__(self, app, name, form):
         super(BrokerGroupInput, self).__init__(app, name, form)

Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt	2008-04-07 17:23:08 UTC (rev 1848)
+++ mgmt/notes/justin-todo.txt	2008-04-07 17:30:14 UTC (rev 1849)
@@ -58,8 +58,6 @@
 
  * Add "slowest views" tracking to cumin-bench
 
- * Get rid of SQLObjectItemSet
-
  * Only perform js updates if there's new data
 
  * Avoid dirtying js namespace with updateFoo methods