Author: eallen Date: 2008-11-11 15:39:13 -0500 (Tue, 11 Nov 2008) New Revision: 2787 Modified: mgmt/trunk/cumin/python/cumin/brokergroup.py Log: Fix exception when canceling Broker Group Add. Fix canceling Broker Group Edit so it returns to correct page instead of always redirecting to BrokerGroupSet page. Modified: mgmt/trunk/cumin/python/cumin/brokergroup.py =================================================================== --- mgmt/trunk/cumin/python/cumin/brokergroup.py 2008-11-11 20:15:06 UTC (rev 2786) +++ mgmt/trunk/cumin/python/cumin/brokergroup.py 2008-11-11 20:39:13 UTC (rev 2787) @@ -136,11 +136,9 @@ class BrokerGroupAdd(BrokerGroupForm): def process_cancel(self, session): branch = session.branch() - self.page.pop_current_frame(branch) - self.page.pop_current_frame(branch) - self.page.get_current_frame(branch).show_view(branch) + self.page.main.view.show(branch) self.page.set_redirect_url(session, branch.marshal()) - + def process_submit(self, session): errors = self.validate(session) @@ -162,8 +160,7 @@ def process_cancel(self, session, group): branch = session.branch() - self.page.pop_current_frame(branch) - self.page.get_current_frame(branch).show_view(branch) + self.frame.show_view(branch) self.page.set_redirect_url(session, branch.marshal()) def process_submit(self, session, group): @@ -190,7 +187,6 @@ def process_cancel(self, session, group): branch = session.branch() - self.frame.show_view(branch) self.page.pop_current_frame(branch) self.page.set_redirect_url(session, branch.marshal())