[rhmessaging-commits] rhmessaging commits: r2847 - mgmt/trunk/cumin/python/cumin.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Wed Nov 19 17:20:36 EST 2008
Author: eallen
Date: 2008-11-19 17:20:36 -0500 (Wed, 19 Nov 2008)
New Revision: 2847
Modified:
mgmt/trunk/cumin/python/cumin/brokerlink.py
mgmt/trunk/cumin/python/cumin/exchange.py
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/cumin/python/cumin/queue.py
mgmt/trunk/cumin/python/cumin/system.py
Log:
Fixed problem with showing dialogs from broker details tab.
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-11-19 22:19:40 UTC (rev 2846)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-11-19 22:20:36 UTC (rev 2847)
@@ -601,12 +601,15 @@
return "No, do not restore if broker restarts"
class BrokerLinkAdd(BrokerLinkAddForm):
- def process_cancel(self, session):
+ def get_args(self, session):
+ return (self.frame.get_object(session), )
+
+ def process_cancel(self, session, *args):
branch = session.branch()
self.frame.show_view(branch)
self.page.set_redirect_url(session, branch.marshal())
- def process_submit(self, session):
+ def process_submit(self, session, reg):
if self.validate(session):
pass
else:
@@ -623,7 +626,6 @@
link.host = host
link.port = port
link.durable = (durable == "yes")
- reg = self.frame.get_object(session)
args = {"reg": reg,
"username": username,
@@ -634,7 +636,7 @@
action.invoke(link, args)
# navigate back to main queue frame
- self.process_cancel(session)
+ self.process_cancel(session, (reg,))
class BrokerSetClose(CuminBulkActionForm):
def process_return(self, session):
Modified: mgmt/trunk/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.py 2008-11-19 22:19:40 UTC (rev 2846)
+++ mgmt/trunk/cumin/python/cumin/exchange.py 2008-11-19 22:20:36 UTC (rev 2847)
@@ -463,14 +463,14 @@
class ExchangeAdd(ExchangeForm):
def get_args(self, session):
- return self.frame.frame.get_args(session)
+ return (self.frame.get_object(session), )
- def process_cancel(self, session):
+ def process_cancel(self, session, *args):
branch = session.branch()
self.frame.show_view(branch)
self.page.set_redirect_url(session, branch.marshal())
- def process_submit(self, session):
+ def process_submit(self, session, *args):
errors = self.validate(session)
if errors:
@@ -491,8 +491,8 @@
self.process_cancel(session)
- def render_title(self, session):
- return "Add Exchange"
+ def render_title(self, session, reg):
+ return "Add Exchange to the Broker '%s'" % reg.name
class ExchangeStats(TabbedModeSet):
def __init__(self, app, name):
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-11-19 22:19:40 UTC (rev 2846)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-11-19 22:20:36 UTC (rev 2847)
@@ -779,6 +779,7 @@
def show(self, session, reg):
frame = self.cumin_class.show_object(session, reg)
+ frame.set_object(session, reg)
return frame.exchange_add.show(session)
def do_invoke(self, exchange, args, completion):
@@ -808,6 +809,7 @@
def show(self, session, reg):
frame = self.cumin_class.show_object(session, reg)
+ frame.set_object(session, reg)
return frame.link_add.show(session)
def do_invoke(self, link, args, completion):
@@ -841,8 +843,9 @@
def get_verb(self, session):
return "Add"
- def show(self, session, queue):
- frame = self.cumin_class.show_object(session, queue)
+ def show(self, session, reg):
+ frame = self.cumin_class.show_object(session, reg)
+ frame.set_object(session, reg)
return frame.queue_add.show(session)
def do_invoke(self, queue, args, completion):
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2008-11-19 22:19:40 UTC (rev 2846)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2008-11-19 22:20:36 UTC (rev 2847)
@@ -491,12 +491,15 @@
return "Ring Strict"
class QueueAdd(QueueForm):
- def process_cancel(self, session):
+ def get_args(self, session):
+ return (self.frame.get_object(session), )
+
+ def process_cancel(self, session, *args):
branch = session.branch()
self.frame.show_view(branch)
self.page.set_redirect_url(session, branch.marshal())
- def process_submit(self, session):
+ def process_submit(self, session, reg):
queue_name = self.namef.get(session)
durable = self.durable.get(session)
@@ -510,7 +513,6 @@
queue = Queue()
queue.name = queue_name
queue.durable = (durable == "yes")
- reg = self.frame.get_object(session)
args = {}
args["reg"] = reg
@@ -541,8 +543,7 @@
# navigate back to main queue frame
self.process_cancel(session)
- def render_title(self, session, *args):
- reg = self.frame.get_object(session)
+ def render_title(self, session, reg):
return "Add Queue to the Broker '%s'" % reg.name
class QueueRemove(CuminConfirmForm):
Modified: mgmt/trunk/cumin/python/cumin/system.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.py 2008-11-19 22:19:40 UTC (rev 2846)
+++ mgmt/trunk/cumin/python/cumin/system.py 2008-11-19 22:20:36 UTC (rev 2847)
@@ -20,7 +20,7 @@
col = self.NameColumn(app, "name")
self.add_column(col)
self.set_default_column(col)
-
+
def render_title(self, session, *args):
count = System.select().count()
return "Systems %s" % fmt_count(count)
@@ -142,7 +142,7 @@
def render_sql_where(self, session, system):
elems = list()
- elems.append("machine = %(nodeName)s")
+ elems.append("system = %(nodeName)s")
elems.append("s.deletion_time is null")
return "where %s" % " and ".join(elems)
More information about the rhmessaging-commits
mailing list