[Erp5-report] r34353 nicolas.dumazet - /erp5/trunk/products/Formulator/Validator.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Apr  8 09:56:44 2010
New Revision: 34353

URL: http://svn.erp5.org?rev=34353&view=rev
Log:
Bug #23: add a 'required' option to FileField. Defaults to False.

Modified:
    erp5/trunk/products/Formulator/Validator.py

Modified: erp5/trunk/products/Formulator/Validator.py
URL: http://svn.erp5.org/erp5/trunk/products/Formulator/Validator.py?rev=34353&r1=34352&r2=34353&view=diff
==============================================================================
--- erp5/trunk/products/Formulator/Validator.py [utf8] (original)
+++ erp5/trunk/products/Formulator/Validator.py [utf8] Thu Apr  8 09:56:44 2010
@@ -553,8 +553,22 @@
 MultiSelectionValidatorInstance = MultiSelectionValidator()
 
 class FileValidator(Validator):
-    def validate(self, field, key, REQUEST):
-        return REQUEST.get(key, None)
+    required = fields.CheckBoxField('required',
+                                    title='Required',
+                                    description=(
+                                      "Checked if the field is required; the "
+                                      "user has to fill in some data."),
+                                    default=0)
+    property_names = Validator.property_names + ['required']
+
+    message_names = Validator.message_names + ['required_not_found']
+    required_not_found = 'Input is required but no input given.'
+
+    def validate(self, field, key, REQUEST):
+        value = REQUEST.get(key, None) 
+        if field.get_value('required') and value in (None, ''):
+	          self.raise_error('required_not_found', field)
+        return value
     
 FileValidatorInstance = FileValidator()