Commit b8577cb2 authored by Sebastien Robin's avatar Sebastien Robin

fixed bug with relation field and file field in the same form

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2742 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 32a0b6a7
No related merge requests found
...@@ -38,6 +38,7 @@ from AccessControl import ClassSecurityInfo ...@@ -38,6 +38,7 @@ from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions as ERP5Permissions from Products.ERP5Type import Permissions as ERP5Permissions
from Products.ERP5Form import _dtmldir from Products.ERP5Form import _dtmldir
from Selection import Selection from Selection import Selection
from ZPublisher.HTTPRequest import FileUpload
from email.MIMEBase import MIMEBase from email.MIMEBase import MIMEBase
from email import Encoders from email import Encoders
from copy import copy from copy import copy
...@@ -933,7 +934,12 @@ class SelectionTool( UniqueObject, SimpleItem ): ...@@ -933,7 +934,12 @@ class SelectionTool( UniqueObject, SimpleItem ):
# Save the current REQUEST form # Save the current REQUEST form
form_pickle, form_signature = self.getPickleAndSignature(**REQUEST.form) pickle_kw = {}
for key in REQUEST.form.keys():
if not isinstance(REQUEST.form[key],FileUpload):
pickle_kw[key] = REQUEST.form[key]
form_pickle, form_signature = self.getPickleAndSignature(**pickle_kw)
REQUEST.form_pickle = form_pickle REQUEST.form_pickle = form_pickle
REQUEST.form_signature = form_signature REQUEST.form_signature = form_signature
...@@ -1066,6 +1072,7 @@ class SelectionTool( UniqueObject, SimpleItem ): ...@@ -1066,6 +1072,7 @@ class SelectionTool( UniqueObject, SimpleItem ):
""" """
viewSearchRelatedDocumentDialog Wrapper viewSearchRelatedDocumentDialog Wrapper
""" """
LOG('SelectionTool.viewSearchRelatedDocumentDialogWrapper, kw',0,kw)
if sub_index == None: if sub_index == None:
return self.viewSearchRelatedDocumentDialog(method_count, form_id, REQUEST=REQUEST, **kw) return self.viewSearchRelatedDocumentDialog(method_count, form_id, REQUEST=REQUEST, **kw)
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