Commit 1c943acf authored by Romain Courteaud's avatar Romain Courteaud

Bug fix: MultiRelationField's wheel is now compatible with ProxyField.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6054 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6ab3e4d4
......@@ -523,7 +523,7 @@ class MultiRelationStringField(ZMIField):
Optionally pass keyword arguments that get passed to TALES
expression.
"""
if id == 'is_relation_field':
if id in ('is_relation_field', 'is_multi_relation_field'):
result = 1
else:
result = ZMIField.get_value(self, id, **kw)
......
......@@ -475,6 +475,8 @@ class RelationStringField(ZMIField):
"""
if id == 'is_relation_field':
result = 1
elif id == 'is_multi_relation_field':
result = 0
else:
result = ZMIField.get_value(self, id, **kw)
return result
......@@ -1006,7 +1006,7 @@ class SelectionTool( UniqueObject, SimpleItem ):
# '%s' in the field: '%s'" % (field_value, field.get_orig_value('title'))
portal_status_message = "Please select one object."
if field.meta_type == "MultiRelationStringField":
if field.get_value('is_multi_relation_field'):
if sub_index is None:
# user click on the wheel, not on the validation button
# we need to facilitate user search
......
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