Commit 29d74f69 authored by Jean-Paul Smets's avatar Jean-Paul Smets

Use absolute_url instead of getPath. Add an empty object so that the user can...

Use absolute_url instead of getPath. Add an empty object so that the user can select none of the found items.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12074 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e435b79f
...@@ -306,15 +306,16 @@ class MultiRelationStringFieldWidget(Widget.LinesTextAreaWidget, ...@@ -306,15 +306,16 @@ class MultiRelationStringFieldWidget(Widget.LinesTextAreaWidget,
portal_url = getToolByName(here, 'portal_url') portal_url = getToolByName(here, 'portal_url')
portal_url_string = portal_url() portal_url_string = portal_url()
portal_object = portal_url.getPortalObject() portal_object = portal_url.getPortalObject()
portal_selections_url_string = here.portal_selections.absolute_url_path()
if sub_index is None: if sub_index is None:
sub_index_string = '' sub_index_string = ''
else: else:
sub_index_string = '_%s' % sub_index sub_index_string = '_%s' % sub_index
return '&nbsp;<input type="image" ' \ return '&nbsp;<input type="image" ' \
'src="%s/images/exec16.png" value="update..." ' \ 'src="%s/images/exec16.png" value="update..." ' \
'name="%s/portal_selections/viewSearchRelatedDocumentDialog%s%s' \ 'name="%s/viewSearchRelatedDocumentDialog%s%s' \
':method"/>' % \ ':method"/>' % \
(portal_url_string, portal_object.getPath(), (portal_url_string, portal_selections_url_string,
relation_index, sub_index_string) relation_index, sub_index_string)
def render_relation_link(self, field, value, REQUEST): def render_relation_link(self, field, value, REQUEST):
...@@ -728,6 +729,8 @@ class MultiRelationStringFieldValidator(Validator.LinesValidator): ...@@ -728,6 +729,8 @@ class MultiRelationStringFieldValidator(Validator.LinesValidator):
menu_item_list.extend([( menu_item_list.extend([(
x.getObject().getProperty(catalog_index), x.getObject().getProperty(catalog_index),
x.uid) for x in relation_list]) x.uid) for x in relation_list])
# Add blank line
menu_item_list.append(('', ''))
REQUEST.set(relation_item_id, menu_item_list) REQUEST.set(relation_item_id, menu_item_list)
raising_error_needed = 1 raising_error_needed = 1
raising_error_value = 'relation_result_ambiguous' raising_error_value = 'relation_result_ambiguous'
......
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