[Mpuls-commits] r3634 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-09-14 20:56:29 +0200 (Tue, 14 Sep 2010)
New Revision: 3634

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/validators.py
Log:
* mpulsweb/lib/validators.py (BundleActionForm.action): Improve
formatting.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-09-14 18:39:24 UTC (rev 3633)
+++ base/trunk/ChangeLog	2010-09-14 18:56:29 UTC (rev 3634)
@@ -1,5 +1,10 @@
 2010-09-14  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/validators.py (BundleActionForm.action): Improve
+	formatting.
+
+2010-09-14  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/controllers/evaluate.py (EvaluateController.evaluate)
 	(EvaluateController.evaluateAction): Use log.exception instead of
 	log.error.  Now there's no need to print or log the traceback

Modified: base/trunk/mpulsweb/lib/validators.py
===================================================================
--- base/trunk/mpulsweb/lib/validators.py	2010-09-14 18:39:24 UTC (rev 3633)
+++ base/trunk/mpulsweb/lib/validators.py	2010-09-14 18:56:29 UTC (rev 3634)
@@ -672,26 +672,25 @@
     filter_extra_fields = True
 
     all_cases = Int(if_missing=0)
-    action = All(String(not_empty=True), OneOf(['no_action',
-                                                'markdelete',
-                                                'delete',
-                                                'markanonymize',
-                                                'anonymize',
-                                                'restore',
-                                                'standin',
-                                                'transfer', 
-                                                'exportXML',
-                                                'exportCSV',
-                                                'exportXLS']
-                                               ))
+    action = All(String(not_empty=True),
+                 OneOf(['no_action',
+                        'markdelete', 'delete',
+                        'markanonymize', 'anonymize',
+                        'restore',
+                        'standin', 'transfer',
+                        'exportXML', 'exportCSV', 'exportXLS',
+                        'evaluate']))
     case_id = ForEach(Int(), convert_to_list=True)
 
+
 class ExportSelectorValidator(BaseFormValidator):
+
     filter_extra_fields = True
     exportanonym = Bool()
     exporttype = String()
     exportselection = ForEach(String(), convert_to_list=True)
 
+
 class SetBundleEditorForm(BaseFormValidator):
 
     editor = Int(not_empty=True)