Commit c8b290b8 authored by Christophe Dumez's avatar Christophe Dumez

- Removed FileUpload objects from request before pickling to avoid problems

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9081 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ec5120ee
...@@ -81,6 +81,17 @@ from ZTUtils import make_query\n ...@@ -81,6 +81,17 @@ from ZTUtils import make_query\n
request_form = context.REQUEST.form\n request_form = context.REQUEST.form\n
error_message = \'\'\n error_message = \'\'\n
\n \n
def removeUnpickableObjectsFromDict(request_form):\n
"""\n
Known unpickable objects:\n
- <ZPublisher.HTTPRequest.FileUpload instance>\n
"""\n
cleaned_dict = request_form.copy()\n
for k, v in cleaned_dict.items():\n
if v in (None, \'\') or hasattr(v, \'read\'):\n
del cleaned_dict[k]\n
return cleaned_dict\n
\n
# Make this script work alike wether called from another script or by a request\n # Make this script work alike wether called from another script or by a request\n
# Reinject parameters in the request\n # Reinject parameters in the request\n
request_form[\'dialog_method\'] = dialog_method\n request_form[\'dialog_method\'] = dialog_method\n
...@@ -206,7 +217,10 @@ if len(listbox_id_list):\n ...@@ -206,7 +217,10 @@ if len(listbox_id_list):\n
request_form[listbox_id] = listbox_line_list\n request_form[listbox_id] = listbox_line_list\n
\n \n
if enable_pickle or (form.update_action != \'\'):\n if enable_pickle or (form.update_action != \'\'):\n
request_form[\'pickle_string\'] = context.portal_selections.getPickle(**request_form)\n #############################################\n
context.log(\'request_form\', request_form)\n
request_form_cleaned = removeUnpickableObjectsFromDict(request_form)\n
request_form[\'pickle_string\'] = context.portal_selections.getPickle(**request_form_cleaned)\n
\n \n
# Check if the selection changed\n # Check if the selection changed\n
if hasattr(request_form, \'previous_md5_object_uid_list\'):\n if hasattr(request_form, \'previous_md5_object_uid_list\'):\n
...@@ -324,6 +338,7 @@ return context.REQUEST.RESPONSE.redirect(redirect_url)\n ...@@ -324,6 +338,7 @@ return context.REQUEST.RESPONSE.redirect(redirect_url)\n
<string>context</string> <string>context</string>
<string>request_form</string> <string>request_form</string>
<string>error_message</string> <string>error_message</string>
<string>removeUnpickableObjectsFromDict</string>
<string>_write_</string> <string>_write_</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>k</string> <string>k</string>
...@@ -353,6 +368,7 @@ return context.REQUEST.RESPONSE.redirect(redirect_url)\n ...@@ -353,6 +368,7 @@ return context.REQUEST.RESPONSE.redirect(redirect_url)\n
<string>key</string> <string>key</string>
<string>listbox_line</string> <string>listbox_line</string>
<string>tuple</string> <string>tuple</string>
<string>request_form_cleaned</string>
<string>selection_list</string> <string>selection_list</string>
<string>map</string> <string>map</string>
<string>object_uid_list</string> <string>object_uid_list</string>
......
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