Commit df456f57 authored by Romain Courteaud's avatar Romain Courteaud

Bug fix

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2429 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bc17e3e4
...@@ -349,30 +349,25 @@ class MultiRelationStringFieldValidator(Validator.LinesValidator, RelationField ...@@ -349,30 +349,25 @@ class MultiRelationStringFieldValidator(Validator.LinesValidator, RelationField
# Will be interpreted by Base_edit as "delete relation" (with no uid and value = '') # Will be interpreted by Base_edit as "delete relation" (with no uid and value = '')
if REQUEST.has_key( relation_field_id ): if REQUEST.has_key( relation_field_id ):
# user click on the wheel: get the selection, and store the relation # we must know if user validate the form or click on the wheel button
if value_list == ['%']: relation_uid_list = REQUEST.get(relation_field_id, None)
# we must know if user validate the form or click on the wheel button if relation_uid_list != None:
relation_uid_list = REQUEST.get(relation_field_id, None) relation_editor_list = []
if relation_uid_list != None: for i in range( len(relation_uid_list) ):
relation_editor_list = []
for i in range( len(relation_uid_list) ): relation_item_id = 'item_%s_%s' % ( key, i )
relation_uid = relation_uid_list[i]
relation_item_id = 'item_%s_%s' % ( key, i )
relation_uid = relation_uid_list[i] related_object = portal_catalog.getObject(relation_uid)
if related_object is not None:
related_object = portal_catalog.getObject(relation_uid) display_text = str(related_object.getProperty(catalog_index))
if related_object is not None: else:
display_text = str(related_object.getProperty(catalog_index)) display_text = 'Object has been deleted'
else: # Check
display_text = 'Object has been deleted' REQUEST.set(relation_item_id, ( (display_text, relation_uid), ))
# Check relation_editor_list.append( (i, '%', str(relation_uid), display_text) )
REQUEST.set(relation_item_id, ( (display_text, relation_uid), ))
relation_editor_list.append( (i, '%', str(relation_uid), display_text) )
return MultiRelationEditor(field.id, base_category, portal_type, portal_type_item, catalog_index, relation_setter_id, relation_editor_list) return MultiRelationEditor(field.id, base_category, portal_type, portal_type_item, catalog_index, relation_setter_id, relation_editor_list)
else:
# value must be define to ['%'] to see all objects in listbox
raise
else: else:
......
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