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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-05-28 10:32:49 -0400 (Wed, 28 May 2008)
New Revision: 2081

Modified:
   mgmt/cumin/python/cumin/broker.py
Log:
bz446977 - Use an initiator-set url to return from BrokerSetRemove form completion

Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2008-05-28 14:07:46 UTC (rev 2080)
+++ mgmt/cumin/python/cumin/broker.py	2008-05-28 14:32:49 UTC (rev 2081)
@@ -52,8 +52,9 @@
             self.parent.ids.clear(session)
 
             branch = session.branch()
-            frame = self.frame.show_brokers_remove(branch)
+            frame = self.page.show_main(branch).show_brokers_remove(branch)
             frame.ids.set(branch, ids)
+            frame.return_url.set(branch, session.marshal())
             self.page.set_redirect_url(session, branch.marshal())
 
     class BrokerSetGroupInput(BrokerGroupInput):
@@ -744,11 +745,14 @@
         return "No, Cancel"
 
 class BrokerSetRemove(CuminBulkActionForm, Frame):
+    def __init__(self, app, name):
+        super(BrokerSetRemove, self).__init__(app, name)
+
+        self.return_url = Parameter(app, "return_url")
+        self.add_parameter(self.return_url)
+
     def process_return(self, session):
-        branch = session.branch()
-        self.frame.show_view(branch)
-        self.page.set_current_frame(branch, self.frame)
-        self.page.set_redirect_url(session, branch.marshal())
+        self.page.set_redirect_url(session, self.return_url.get(session))
 
     def process_item(self, session, id):
         action = self.app.model.broker_registration.remove