[rhmessaging-commits] rhmessaging commits: r1412 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-03 11:01:14 -0500 (Mon, 03 Dec 2007)
New Revision: 1412

Modified:
   mgmt/cumin/python/cumin/broker.py
   mgmt/cumin/python/cumin/brokercluster.py
   mgmt/cumin/python/cumin/brokergroup.py
   mgmt/cumin/python/cumin/brokerprofile.py
Log:
Use SQLObjectItemSet where appropriate.



Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/broker.py	2007-12-03 16:01:14 UTC (rev 1412)
@@ -105,7 +105,7 @@
 
     class BrokerPaginator(Paginator):
         def get_object(self, session, model):
-            return list(Broker.select()) #XXX ugh
+            return list(BrokerRegistration.select()) #XXX ugh
 
 class BrokerFrame(CuminFrame):
     def __init__(self, app, name):

Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py	2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/brokercluster.py	2007-12-03 16:01:14 UTC (rev 1412)
@@ -12,7 +12,7 @@
 
 strings = StringCatalog(__file__)
 
-class BrokerClusterSet(ItemSet):
+class BrokerClusterSet(SQLObjectItemSet):
     def render_cluster_add_href(self, session, model):
         branch = session.branch()
         self.page().show_broker_cluster_add(branch)
@@ -22,7 +22,7 @@
         return "Broker Clusters %s" % fmt_count(BrokerCluster.select().count())
 
     def do_get_items(self, session, model):
-        return list(BrokerCluster.select())
+        return BrokerCluster.select()
 
     def render_item_link(self, session, cluster):
         branch = session.branch()

Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py	2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/brokergroup.py	2007-12-03 16:01:14 UTC (rev 1412)
@@ -10,7 +10,7 @@
 
 strings = StringCatalog(__file__)
 
-class BrokerGroupSet(ItemSet):
+class BrokerGroupSet(SQLObjectItemSet):
     def get_title(self, session, model):
         return "Broker Groups %s" % fmt_count(BrokerGroup.select().count())
 
@@ -20,7 +20,7 @@
         return branch.marshal()
 
     def do_get_items(self, session, model):
-        return list(BrokerGroup.select())
+        return BrokerGroup.select()
 
     def render_item_link(self, session, group):
         branch = session.branch()

Modified: mgmt/cumin/python/cumin/brokerprofile.py
===================================================================
--- mgmt/cumin/python/cumin/brokerprofile.py	2007-12-03 15:57:29 UTC (rev 1411)
+++ mgmt/cumin/python/cumin/brokerprofile.py	2007-12-03 16:01:14 UTC (rev 1412)
@@ -11,7 +11,7 @@
 
 strings = StringCatalog(__file__)
 
-class BrokerProfileSet(ItemSet):
+class BrokerProfileSet(SQLObjectItemSet):
     def render_profile_add_href(self, session, profile):
         branch = session.branch()
         self.page().show_broker_profile_add(branch)
@@ -21,7 +21,7 @@
         return "Broker Profiles %s" % fmt_count(BrokerProfile.select().count())
 
     def do_get_items(self, session, model):
-        return list(BrokerProfile.select())
+        return BrokerProfile.select()
 
     def render_item_link(self, session, profile):
         branch = session.branch()