[rhmessaging-commits] rhmessaging commits: r3752 - mgmt/trunk/cumin/python/cumin/messaging.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-12-21 09:48:13 -0500 (Mon, 21 Dec 2009)
New Revision: 3752

Modified:
   mgmt/trunk/cumin/python/cumin/messaging/queue.py
Log:
Use a standard FieldSubmitForm

Modified: mgmt/trunk/cumin/python/cumin/messaging/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/queue.py	2009-12-18 18:07:38 UTC (rev 3751)
+++ mgmt/trunk/cumin/python/cumin/messaging/queue.py	2009-12-21 14:48:13 UTC (rev 3752)
@@ -514,7 +514,7 @@
         self.object = QueueParameter(app, "queue")
         self.add_parameter(self.object)
 
-class QueuePurgeForm(CuminFieldForm):
+class QueuePurgeForm(FieldSubmitForm):
     def __init__(self, app, name, task):
         super(QueuePurgeForm, self).__init__(app, name)
 
@@ -528,31 +528,27 @@
 
     def render_title(self, session):
         queue = self.queue.get(session)
-        return "Purge Messages from  Queue '%s'" % queue.name
+        return self.task.get_description(session, queue)
 
     def process_submit(self, session):
-        queue = self.queue.get(session)
-        request_amt = self.purge_request.get(session)
+        self.check(session)
 
-        if request_amt == "all":
-            count = 0
-        elif request_amt == "top":
-            count = 1
-        elif request_amt == "N":
-            count = self.purge_request.top_n.get_n_value(session)
-        else:
-            raise Exception("Wrong Value")
+        if not self.errors.get(session):
+            queue = self.queue.get(session)
+            request_amt = self.purge_request.get(session)
 
-        self.task.invoke(session, queue, count)
-        self.task.exit_with_redirect(session, queue)
+            if request_amt == "all":
+                count = 0
+            elif request_amt == "top":
+                count = 1
+            elif request_amt == "N":
+                count = self.purge_request.top_n.get_n_value(session)
+            else:
+                raise Exception("Wrong Value")
 
-    def render_submit_content(self, session):
-        queue = self.queue.get(session)
-        return "Yes, Purge Messages from Queue '%s'" % queue.name
+            self.task.invoke(session, queue, count)
+            self.task.exit_with_redirect(session, queue)
 
-    def render_cancel_content(self, session):
-        return "No, Cancel"
-
 class QueueSetTaskForm(CuminTaskForm):
     def __init__(self, app, name, task):
         super(QueueSetTaskForm, self).__init__(app, name, task)