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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-05-08 13:27:43 -0400 (Thu, 08 May 2008)
New Revision: 2007

Modified:
   mgmt/cumin/python/cumin/broker.py
Log:
Fix frame navigation in broker registration add form.

Don't violate the 80th column.



Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2008-05-08 16:05:36 UTC (rev 2006)
+++ mgmt/cumin/python/cumin/broker.py	2008-05-08 17:27:43 UTC (rev 2007)
@@ -573,7 +573,8 @@
 class BrokerSetAdd(BrokerSetForm):
     def process_cancel(self, session):
         branch = session.branch()
-        self.frame.show_view(branch)
+        frame = self.page.pop_current_frame(branch)
+        frame.show_view(branch)
         self.page.set_redirect_url(session, branch.marshal())
 
     def process_submit(self, session):
@@ -629,8 +630,10 @@
                     errs.append("The address field is empty; it is required")
                 else:
                     host, port = parse_broker_addr(addr)
+                    count = BrokerRegistration.selectBy \
+                        (host=host, port=port).count()
 
-                    if BrokerRegistration.selectBy(host=host, port=port).count():
+                    if count:
                         errs = aerrs.setdefault(i, list())
                         errs.append("The broker at %s:%i " % (host, port) +
                                     "is already registered")