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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-01-13 23:45:16 -0500 (Sun, 13 Jan 2008)
New Revision: 1558

Modified:
   mgmt/cumin/python/cumin/broker.py
   mgmt/cumin/python/cumin/broker.strings
Log:
Repairs the broker group assign button.



Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2008-01-13 21:19:22 UTC (rev 1557)
+++ mgmt/cumin/python/cumin/broker.py	2008-01-14 04:45:16 UTC (rev 1558)
@@ -46,6 +46,9 @@
         self.__unregister = self.Unregister(app, "unregister", self)
         self.add_child(self.__unregister)
 
+        self.groupify = self.Groupify(app, "groupify", self)
+        self.add_child(self.groupify)
+
     def get_title(self, session, model):
         count = BrokerRegistration.select().count()
         return "Brokers %s" % fmt_count(count)
@@ -66,16 +69,24 @@
             frame.ids.set(branch, ids)
             self.page().set_redirect_url(session, branch.marshal())
 
+    class BrokerSetGroupInput(BrokerGroupInput):
+        def render_submit_id(self, session, model):
+            return self.parent.groupify.path()
+
     class Groupify(FormButton):
         def render_content(self, session, model):
-            return "Add to Group"
+            return "Add"
 
         def process_submit(self, session, model):
             group = self.parent.groups.get(session)
 
             if group:
-                for broker in brokers:
+                ids = self.parent.ids.get(session)
+                self.parent.ids.clear(session)
+
+                for id in ids:
                     try:
+                        broker = BrokerRegistration.get(id)
                         broker.addBrokerGroup(group)
                     except IntegrityError:
                         pass
@@ -120,9 +131,6 @@
 
             return link
 
-    class BrokerSetGroupInput(BrokerGroupInput):
-        pass
-
 class BrokerFrame(CuminFrame):
     def __init__(self, app, name):
         super(BrokerFrame, self).__init__(app, name)

Modified: mgmt/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/cumin/python/cumin/broker.strings	2008-01-13 21:19:22 UTC (rev 1557)
+++ mgmt/cumin/python/cumin/broker.strings	2008-01-14 04:45:16 UTC (rev 1558)
@@ -3,11 +3,13 @@
   <!-- <select onchange="document.getElementById('{id}.submit').submit()"> -->
 
   <div class="sactions">
-    <h2>Act on Selected Brokers:</h2>
+    <h2>Act on Selection:</h2>
     {unregister}
 
+    &nbsp;
+
     <h2>Add to Group:</h2>
-    {groups}
+    {groups} {groupify}
   </div>
 
   <table class="mobjects">
@@ -31,7 +33,7 @@
 }
 
 [BrokerSetGroupInput.html]
-<select name="{name}" tabindex="{tab_index}" {disabled_attr} onchange="submit()">
+<select name="{name}" tabindex="{tab_index}" {disabled_attr} onchange="getElementById('{submit_id}').click()">
   <option value="">Choose Group...</option>
   {items}
 </select>