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

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-01-14 08:34:00 -0500 (Mon, 14 Jan 2008)
New Revision: 1560

Modified:
   mgmt/cumin/python/cumin/broker.py
   mgmt/cumin/python/cumin/client.py
   mgmt/cumin/python/cumin/queue.py
Log:
Instead of generic language, use specific verbiage for each bulk
action.



Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2008-01-14 13:20:15 UTC (rev 1559)
+++ mgmt/cumin/python/cumin/broker.py	2008-01-14 13:34:00 UTC (rev 1560)
@@ -726,6 +726,11 @@
     def get_title(self, session, model):
         return "Unregister Brokers"
 
+    def process_return(self, session, id):
+        branch = session.branch()
+        self.frame().show_view(branch)
+        self.page().set_redirect_url(session, branch.marshal())
+
     def process_item(self, session, id):
         try:
             broker = BrokerRegistration.get(id)
@@ -734,10 +739,5 @@
             # In an extra ui step, note any errors that arose
             print e
 
-    def process_return(self, session, id):
-        branch = session.branch()
-        self.frame().show_view(branch)
-        self.page().set_redirect_url(session, branch.marshal())
-
     def render_item_content(self, session, id):
         return "Unregister Broker '%s'" % BrokerRegistration.get(id).name

Modified: mgmt/cumin/python/cumin/client.py
===================================================================
--- mgmt/cumin/python/cumin/client.py	2008-01-14 13:20:15 UTC (rev 1559)
+++ mgmt/cumin/python/cumin/client.py	2008-01-14 13:34:00 UTC (rev 1560)
@@ -223,6 +223,9 @@
         except Exception, e:
             self.add_error(session, e)
 
+    def render_item_content(self, session, id):
+        return "Close Client %s" % Client.get(id).address
+
 class ClientStatus(CuminStatus):
     def render_frames_from(self, session, client):
         stat = self.app.model.client.get_stat("framesFromClient")
@@ -319,6 +322,11 @@
     def get_title(self, session, object):
         return "Detach Sessions"
     
+    def process_return(self, session, object):
+        branch = session.branch()
+        self.frame().show_view(branch).show_sessions(branch)
+        self.page().set_redirect_url(session, branch.marshal())
+
     def process_item(self, session, id):
         try:
             session_ = Session.get(id)
@@ -326,18 +334,18 @@
         except Exception, e:
             self.add_error(session, e)
 
-    def process_cancel(self, session, object):
-        branch = session.branch()
-        self.frame().show_view(branch).show_sessions(branch)
-        self.page().set_redirect_url(session, branch.marshal())
+    def render_item_content(self, session, id):
+        return "Detach Session '%s'" % Session.get(id).name
 
-    def process_return(self, session, object):
-        self.process_cancel(session, object)
-
 class ClientSessionSetClose(CuminBulkActionForm, Frame):
     def get_title(self, session, object):
         return "Close Sessions"
     
+    def process_return(self, session, object):
+        branch = session.branch()
+        self.frame().show_view(branch).show_sessions(branch)
+        self.page().set_redirect_url(session, branch.marshal())
+
     def process_item(self, session, id):
         try:
             session_ = Session.get(id)
@@ -345,14 +353,9 @@
         except Exception, e:
             self.add_error(session, e)
 
-    def process_cancel(self, session, object):
-        branch = session.branch()
-        self.frame().show_view(branch).show_sessions(branch)
-        self.page().set_redirect_url(session, branch.marshal())
+    def render_item_content(self, session, id):
+        return "Close Session '%s'" % Session.get(id).name
 
-    def process_return(self, session, object):
-        self.process_cancel(session, object)
-
 class ClientSessionSet(CuminTable, Form):
     def __init__(self, app, name):
         super(ClientSessionSet, self).__init__(app, name)

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2008-01-14 13:20:15 UTC (rev 1559)
+++ mgmt/cumin/python/cumin/queue.py	2008-01-14 13:34:00 UTC (rev 1560)
@@ -470,7 +470,6 @@
     def process_return(self, session, object):
         branch = session.branch()
         self.frame().show_view(branch)
-        # XXX need to set current frame here?
         self.page().set_redirect_url(session, branch.marshal())
 
     def process_item(self, session, id):
@@ -480,6 +479,9 @@
         except Exception, e:
             self.add_error(session, e)
 
+    def render_item_content(self, session, id):
+        return "Purge Queue '%s'" % Queue.get(id).name
+
 class QueueBindingAdd(CuminForm):
     def __init__(self, app, name):
         super(QueueBindingAdd, self).__init__(app, name)