[rhmessaging-commits] rhmessaging commits: r3095 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-02-03 11:19:09 -0500 (Tue, 03 Feb 2009)
New Revision: 3095

Modified:
   mgmt/trunk/cumin/python/cumin/broker.py
   mgmt/trunk/cumin/python/cumin/broker.strings
Log:
Add a cluster column to the broker list

Modified: mgmt/trunk/cumin/python/cumin/broker.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.py	2009-02-03 15:57:59 UTC (rev 3094)
+++ mgmt/trunk/cumin/python/cumin/broker.py	2009-02-03 16:19:09 UTC (rev 3095)
@@ -31,6 +31,9 @@
         col = self.GroupsColumn(app, "groups")
         self.add_column(col)
 
+        col = self.ClusterColumn(app, "cluster")
+        self.add_column(col)
+
         self.groups = self.BrokerSetGroupInput(app, "groups")
         self.add_child(self.groups)
 
@@ -120,6 +123,13 @@
 
             return link
 
+    class ClusterColumn(SqlTableColumn):
+        def render_title(self, session, data):
+            return "Cluster"
+
+        def render_content(self, session, data):
+            return data["cluster_name"] or fmt_none()
+
 class TopBrokerSet(CuminTable):
     def __init__(self, app, name):
         super(TopBrokerSet, self).__init__(app, name)

Modified: mgmt/trunk/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.strings	2009-02-03 15:57:59 UTC (rev 3094)
+++ mgmt/trunk/cumin/python/cumin/broker.strings	2009-02-03 16:19:09 UTC (rev 3095)
@@ -1,6 +1,8 @@
 [BrokerSet.sql]
-select br.id, br.name
+select br.id, br.name, c.cluster_name
 from broker_registration as br
+left outer join broker as b on b.registration_id = br.id
+left outer join cluster as c on c.broker_id = b.id
 {sql_where}
 {sql_orderby}
 {sql_limit}