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

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-11-05 10:08:28 -0500 (Wed, 05 Nov 2008)
New Revision: 2742

Modified:
   mgmt/trunk/cumin/python/cumin/queue.py
Log:
Changed defaults on Add Queue advanced options.
Re-arranged the Add Queue form a bit.
Don't send default values on add queue submit.

Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py	2008-11-05 15:06:45 UTC (rev 2741)
+++ mgmt/trunk/cumin/python/cumin/queue.py	2008-11-05 15:08:28 UTC (rev 2742)
@@ -339,9 +339,6 @@
         self.optimistic = self.OptimisticField(app, "optimistic")
         self.more.add_field(self.optimistic)
 
-        self.policy = self.PolicyField(app, "policy")
-        self.more.add_field(self.policy)
-        
         self.file_count = self.FileCountField(app, "file_count")
         self.file_count.input.param.default = 8
         self.more.add_field(self.file_count)
@@ -350,6 +347,9 @@
         self.file_size.input.param.default = 24
         self.more.add_field(self.file_size)
         
+        self.policy = self.PolicyField(app, "policy")
+        self.more.add_field(self.policy)
+        
         self.q_size = self.QSizeField(app, "q_size")
         self.more.add_field(self.q_size)
         
@@ -366,17 +366,17 @@
         
     class QCountField(IntegerField):
         def render_title(self, session):
-            return "Max Queue Count"
+            return "<div style=\"padding-left: 1em;\">Max Queue Count</div>"
         
         def render_field_help(self, session):
-            return "(Maximum in-memory queue size as a number of messages)"
+            return "(Maximum in-memory queue size as a number of messages. Applies if Policy is set.)"
         
     class QSizeField(IntegerField):
         def render_title(self, session):
-            return "Max Queue Size"
+            return "<div style=\"padding-left: 1em;\">Max Queue Size</div>"
         
         def render_field_help(self, session):
-            return "(Maximum in-memory queue size as bytes)"
+            return "(Maximum in-memory queue size as bytes. Applies if Policy is set.)"
         
     class FileCountField(IntegerField):
         def render_title(self, session):
@@ -411,6 +411,7 @@
 
             self.option1_title = "Cluster Durable"
             self.option2_title = "Not Cluster Durable"
+            self.param.default = "transient"
 
         def render_title(self, session):
             return "Cluster Durable?"
@@ -424,6 +425,7 @@
 
             self.option1_title = "Enabled"
             self.option2_title = "Not Enabled"
+            self.param.default = "disable"
 
         def render_title(self, session):
             return "Enable Last Value Queue?"
@@ -437,6 +439,7 @@
 
             self.option1_title = "Enabled"
             self.option2_title = "Not Enabled"
+            self.param.default = "disable"
 
         def render_title(self, session):
             return "Enable Optimistic Consume?"
@@ -449,9 +452,12 @@
             super(QueueForm.PolicyField, self).__init__(app, name, None)
     
             self.param = Parameter(app, "param")
-            self.param.default = "reject"
+            self.param.default = "none"
             self.add_parameter(self.param)
     
+            option = self.NoneField(app, "none", self.param)
+            self.add_option(option)
+            
             option = self.Reject(app, "reject", self.param)
             self.add_option(option)
             
@@ -470,6 +476,13 @@
         def render_field_help(self, session):
             return "(Action taken when queue limit is reached)"
             
+        class NoneField(RadioFieldOption):
+            def render_value(self, session):
+                return "none"
+    
+            def render_title(self, session):
+                return "None"
+    
         class Reject(RadioFieldOption):
             def render_value(self, session):
                 return "reject"
@@ -521,9 +534,20 @@
             args["cluster_durable"] = self.cluster_durable.get(session) == "durable"
             args["lvq"] = self.lvq.get(session) == "enable"
             args["optimistic"] = self.optimistic.get(session) == "enable"
-            args["policy"] = self.policy.get(session)
-            args["file_count"] = self.file_count.get(session)
-            args["file_size"] = self.file_size.get(session)
+            policy = self.policy.get(session)
+            if policy == "none":
+                policy = None
+            args["policy"] = policy
+            
+            file_count = self.file_count.get(session)
+            file_size = self.file_size.get(session)
+            if file_count == self.file_count.input.param.default:
+                file_count = None
+            if file_size == self.file_size.input.param.default:
+                file_size = None
+            args["file_count"] = file_count
+            args["file_size"] = file_size
+
             args["q_count"] = self.q_count.get(session)
             args["q_size"] = self.q_size.get(session)