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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-03 10:08:14 -0500 (Mon, 03 Dec 2007)
New Revision: 1410

Modified:
   mgmt/cumin/python/cumin/broker.py
Log:
Restores the profile and cluster filtering of the broker browser.



Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2007-12-03 15:02:07 UTC (rev 1409)
+++ mgmt/cumin/python/cumin/broker.py	2007-12-03 15:08:14 UTC (rev 1410)
@@ -387,30 +387,17 @@
 
     class BrowserBrokers(BrokerSetForm):
         def get_items(self, session, model):
-            return super(BrokerBrowser.BrowserBrokers, self).get_items \
-                   (session, model)
-            
-            brokers = sorted_by(model.get_brokers())
             group = self.parent().group.get(session)
             profile = self.parent().profile.get(session)
             cluster = self.parent().cluster.get(session)
 
-            for broker in model.get_brokers():
-                if group and group not in broker.broker_group_items():
-                    brokers.remove(broker)
+            brokers = BrokerRegistration.selectBy \
+                (profile = profile, cluster = cluster)
 
-                if profile and profile is not broker.get_broker_profile():
-                    try:
-                        brokers.remove(broker)
-                    except ValueError:
-                        pass
-                    
-                if cluster and cluster is not broker.get_broker_cluster():
-                    try:
-                        brokers.remove(broker)
-                    except ValueError:
-                        pass
+            brokers = list(brokers)
 
+            # XXX add group filtering
+
             return brokers
 
         def render_none(self, session, model):
@@ -429,21 +416,21 @@
         return branch.marshal()
 
     def render_group_filters(self, session, model):
-        groups = sorted_by(model.get_broker_groups())
+        groups = BrokerGroup.select()
         return self._render_filters(session, groups, self.group_tmpl)
 
     def render_group_link(self, session, group):
         return self._render_filter_link(session, group, self.group)
 
     def render_profile_filters(self, session, model):
-        profiles = sorted_by(model.get_broker_profiles())
+        profiles = BrokerProfile.select()
         return self._render_filters(session, profiles, self.profile_tmpl)
 
     def render_profile_link(self, session, profile):
         return self._render_filter_link(session, profile, self.profile)
 
     def render_cluster_filters(self, session, model):
-        clusters = sorted_by(model.get_broker_clusters())
+        clusters = BrokerCluster.select()
         return self._render_filters(session, clusters, self.cluster_tmpl)
 
     def render_cluster_link(self, session, cluster):