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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-11-19 12:13:30 -0500 (Mon, 19 Nov 2007)
New Revision: 1337

Modified:
   mgmt/cumin/python/cumin/brokercluster.py
   mgmt/cumin/python/cumin/brokercluster.strings
   mgmt/cumin/python/cumin/brokergroup.py
   mgmt/cumin/python/cumin/brokergroup.strings
   mgmt/cumin/python/cumin/widgets.py
Log:
Finishes hooking up remove forms.



Modified: mgmt/cumin/python/cumin/brokercluster.py
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.py	2007-11-19 16:29:18 UTC (rev 1336)
+++ mgmt/cumin/python/cumin/brokercluster.py	2007-11-19 17:13:30 UTC (rev 1337)
@@ -57,6 +57,10 @@
         self.add_mode(self.edit)
         self.set_edit_mode(self.edit)
 
+        self.remove = BrokerClusterRemove(app, "remove")
+        self.add_mode(self.remove)
+        self.set_remove_mode(self.remove)
+
         self.broker = BrokerFrame(app, "broker")
         self.add_mode(self.broker)
 
@@ -70,7 +74,7 @@
 class BrokerClusterStatus(CuminStatus):
     pass
 
-class BrokerClusterView(Widget):
+class BrokerClusterView(CuminView):
     def __init__(self, app, name):
         super(BrokerClusterView, self).__init__(app, name)
 

Modified: mgmt/cumin/python/cumin/brokercluster.strings
===================================================================
--- mgmt/cumin/python/cumin/brokercluster.strings	2007-11-19 16:29:18 UTC (rev 1336)
+++ mgmt/cumin/python/cumin/brokercluster.strings	2007-11-19 17:13:30 UTC (rev 1337)
@@ -47,16 +47,10 @@
   <tr>
     <th class="actions" colspan="2">
       <h2>Act on This Cluster:</h2>
-        <form class="inline" action="?" method="get">
-        <select>
-          <option>Choose Action...</option>
-          <option>Edit...</option>
-          <option>Remove</option>
-          <option>Start</option>
-          <option>Stop</option>
-        </select>
-        <button>Submit</button>
-      </form>
+      <a class="nav" href="{edit_href}">Edit</a>
+      <a href="{remove_href}">Remove</a>
+      <a href="{href}">Start</a>
+      <a href="{href}">Stop</a>
     </th>
   </tr>
 </table>

Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py	2007-11-19 16:29:18 UTC (rev 1336)
+++ mgmt/cumin/python/cumin/brokergroup.py	2007-11-19 17:13:30 UTC (rev 1337)
@@ -58,13 +58,17 @@
         self.add_child(self.edit)
         self.set_edit_mode(self.edit)
 
+        self.remove = BrokerGroupRemove(app, "remove")
+        self.add_child(self.remove)
+        self.set_remove_mode(self.remove)
+
     def get_title(self, session, group):
         return "Broker Group '%s'" % group.name
 
 class BrokerGroupStatus(CuminStatus):
     pass
 
-class BrokerGroupView(Widget):
+class BrokerGroupView(CuminView):
     def __init__(self, app, name):
         super(BrokerGroupView, self).__init__(app, name)
 
@@ -85,11 +89,6 @@
     def render_category(self, session, group):
         return group.get_type().name
 
-    def render_edit_href(self, session, group):
-        branch = session.branch()
-        self.page().show_broker_group(branch, group).show_edit(branch)
-        return branch.marshal()
-
     class GroupBrokerTab(BrokerSetForm):
         def get_title(self, session, group):
             return "Brokers %s" % fmt_count(len(group.broker_items()))

Modified: mgmt/cumin/python/cumin/brokergroup.strings
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.strings	2007-11-19 16:29:18 UTC (rev 1336)
+++ mgmt/cumin/python/cumin/brokergroup.strings	2007-11-19 17:13:30 UTC (rev 1337)
@@ -40,7 +40,7 @@
     <th class="actions" colspan="2">
       <h2>Act on This Group:</h2>
       <a class="nav" href="{edit_href}">Edit</a>
-      <a href="{href}">Remove</a>
+      <a href="{remove_href}">Remove</a>
     </th>
   </tr>
 </table>

Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py	2007-11-19 16:29:18 UTC (rev 1336)
+++ mgmt/cumin/python/cumin/widgets.py	2007-11-19 17:13:30 UTC (rev 1337)
@@ -16,6 +16,7 @@
         self.__param = None
         self.__view_mode = None
         self.__edit_mode = None
+        self.__remove_mode = None
 
     def set_object_parameter(self, param):
         self.__param = param