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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-12-03 15:03:33 -0500 (Mon, 03 Dec 2007)
New Revision: 1420

Modified:
   mgmt/cumin/python/cumin/broker.py
   mgmt/cumin/python/cumin/broker.strings
   mgmt/notes/justin-todo.txt
Log:
Hooks up the unregister broker form.



Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2007-12-03 20:00:30 UTC (rev 1419)
+++ mgmt/cumin/python/cumin/broker.py	2007-12-03 20:03:33 UTC (rev 1420)
@@ -119,6 +119,10 @@
         self.add_mode(self.view)
         self.set_view_mode(self.view)
 
+        self.remove = BrokerRemove(app, "remove")
+        self.add_mode(self.remove)
+        self.set_remove_mode(self.remove)
+
         self.prop = BrokerConfigPropertyForm(app, "prop")
         self.add_mode(self.prop)
 
@@ -235,7 +239,7 @@
 class BrokerStatus(CuminStatus):
     pass
 
-class BrokerView(Widget):
+class BrokerView(CuminView):
     def __init__(self, app, name):
         super(BrokerView, self).__init__(app, name)
 
@@ -289,7 +293,6 @@
         def get_title(self, session, broker):
             vhost = self.get_object(session, broker)
             return "Queues %s" % fmt_count(vhost and len(vhost.queues) or 0)
-
         def get_object(self, session, broker):
             broker = broker.broker # Navigate from registration to real broker
             if broker:
@@ -584,7 +587,7 @@
 
 class BrokerRemove(CuminConfirmForm):
     def get_title(self, session, broker):
-        return "Remove Broker '%s'" % broker.port
+        return "Unregister Broker '%s'" % broker.name
 
     def process_cancel(self, session, broker):
         branch = session.branch()
@@ -592,14 +595,14 @@
         self.page().set_redirect_url(session, branch.marshal())
 
     def process_submit(self, session, broker):
-        broker.remove()
+        broker.destroySelf()
 
         branch = session.branch()
         self.page().show_view(branch)
         self.page().set_redirect_url(session, branch.marshal())
 
     def render_submit_content(self, session, broker):
-        return "Yes, Remove Broker '%s'" % broker.port
+        return "Yes, Unregister Broker '%s'" % broker.name
 
     def render_cancel_content(self, session, broker):
         return "No, Cancel"

Modified: mgmt/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/cumin/python/cumin/broker.strings	2007-12-03 20:00:30 UTC (rev 1419)
+++ mgmt/cumin/python/cumin/broker.strings	2007-12-03 20:03:33 UTC (rev 1420)
@@ -134,7 +134,7 @@
     <th class="actions" colspan="2">
       <h2>Act on This Broker:</h2>
       <a href="{href}">Shutdown</a>
-      <a href="{href}">Unregister</a>
+      <a href="{remove_href}">Unregister</a>
     </th>
   </tr>
 </table>

Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt	2007-12-03 20:00:30 UTC (rev 1419)
+++ mgmt/notes/justin-todo.txt	2007-12-03 20:03:33 UTC (rev 1420)
@@ -12,8 +12,6 @@
 
  * Add queue journal stats
 
- * "unregister broker"
-
  * "shutdown brokers"
 
  * "shutdown broker"
@@ -42,8 +40,6 @@
 
  * Prepare for journal stats on queue
 
- * Dispose of old dummy model
-
 Deferred
 
  * Add a wooly.focus(id) method to replace the ad-hoc javascript I'm