[Erp5-report] r40355 aurel - /erp5/trunk/products/ERP5Form/RelationField.py

[nobody at svn.erp5.org]

Author: aurel
Date: Thu Nov 18 11:31:58 2010
New Revision: 40355

URL: http://svn.erp5.org?rev=40355&view=rev
Log:
use the right field key for the validator, thus required relation
field now works when all fields are validated

Modified:
    erp5/trunk/products/ERP5Form/RelationField.py

Modified: erp5/trunk/products/ERP5Form/RelationField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/RelationField.py?rev=40355&r1=40354&r2=40355&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/RelationField.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/RelationField.py [utf8] Thu Nov 18 11:31:58 2010
@@ -124,14 +124,16 @@ class RelationStringFieldValidator(
     """
     relation_item_id = field.generate_subfield_key(ITEM_ID,
                                                    key=key)
-    if isinstance(relation_uid_list, (list, tuple)):
+     if isinstance(relation_uid_list, (list, tuple)):
       try:
         relation_uid_list = relation_uid_list[0]
       except IndexError:
         # No object was selected
         return []
+    relation_field_id = field.generate_subfield_key("%s" % \
+                                                    SUB_FIELD_ID, key=key)
     value = self.default_validator_instance.validate(field, 
-                                                     key, REQUEST)
+                                                     relation_field_id, REQUEST)
     return [(relation_item_id, relation_uid_list, value)]
 
   def _generateFieldValueList(self, field, key,