Commit d824c973 authored by Romain Courteaud's avatar Romain Courteaud

Bug fix.

Base tried to save field name as new property.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5277 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 77ab996e
...@@ -349,10 +349,10 @@ class MultiRelationStringFieldValidator(Validator.LinesValidator, RelationField ...@@ -349,10 +349,10 @@ class MultiRelationStringFieldValidator(Validator.LinesValidator, RelationField
relation_uid_list = REQUEST.get(relation_field_id, None) relation_uid_list = REQUEST.get(relation_field_id, None)
relation_field_sub_id = 'relation_%s_0' % ( key ) relation_field_sub_id = 'relation_%s_0' % ( key )
if checkSameKeys( value_list, current_value_list ) and (relation_uid_list is None) and (not REQUEST.has_key( relation_field_sub_id )): if checkSameKeys( value_list, current_value_list ) and (relation_uid_list is None) and (not REQUEST.has_key( relation_field_sub_id )):
# XXX Will be interpreted by Base_edit as "do nothing" # Will be interpreted by Editor as "do nothing"
#return MultiRelationEditor(field.id, base_category, portal_type, portal_type_item, catalog_index, relation_setter_id, None) return MultiRelationEditor(field.id, base_category,
return None portal_type, portal_type_item,
catalog_index, relation_setter_id, None)
else: else:
relation_field_id = 'relation_%s' % ( key ) relation_field_id = 'relation_%s' % ( key )
......
...@@ -340,10 +340,10 @@ class RelationStringFieldValidator(Validator.StringValidator): ...@@ -340,10 +340,10 @@ class RelationStringFieldValidator(Validator.StringValidator):
relation_setter_id = field.get_value('relation_setter_id') relation_setter_id = field.get_value('relation_setter_id')
if (value == current_value) and (relation_uid is None): if (value == current_value) and (relation_uid is None):
return None # Will be interpreted by Editor as "do nothing"
# XXX return RelationEditor(key, base_category, portal_type, None, return RelationEditor(key, base_category, portal_type, None,
# portal_type_item, catalog_index, value, relation_setter_id, None) portal_type_item, catalog_index, None,
# Will be interpreted by Base_edit as "do nothing" relation_setter_id, None)
if relation_uid not in (None, ''): if relation_uid not in (None, ''):
# A value has been defined by the user # A value has been defined by the user
if type(relation_uid) in (type([]), type(())): if type(relation_uid) in (type([]), type(())):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment