From 87273d803a5f766fe75f49def8b9c464c4a0c737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Thu, 14 Sep 2006 09:16:42 +0000 Subject: [PATCH] 2006-09-14 Aurel * fix removeUnpickableObject in Base_callDialogMethod to take listbox into account git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9898 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_xhtml_style/Base_callDialogMethod.xml | 12 +++++++++++- .../ERP5/bootstrap/erp5_xhtml_style/bt/change_log | 3 +++ product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_callDialogMethod.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_callDialogMethod.xml index 871e26675c..8a8661da18 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_callDialogMethod.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_callDialogMethod.xml @@ -88,6 +88,11 @@ def removeUnpickableObjectsFromDict(request_form):\n """\n cleaned_dict = request_form.copy()\n for k, v in cleaned_dict.items():\n + if k == \'listbox\':\n + new_list = []\n + for line in v:\n + new_list.append(removeUnpickableObjectsFromDict(line))\n + cleaned_dict[k] = tuple(new_list)\n if v in (None, \'\') or hasattr(v, \'read\'):\n del cleaned_dict[k]\n return cleaned_dict\n @@ -205,7 +210,6 @@ if len(listbox_id_list):\n listbox_line_list.append(listbox_line)\n listbox_line_list = tuple(listbox_line_list)\n request_form[listbox_id] = listbox_line_list\n -\n if enable_pickle or (form.update_action != \'\'):\n request_form_cleaned = removeUnpickableObjectsFromDict(request_form)\n request_form[\'pickle_string\'] = context.portal_selections.getPickle(**request_form_cleaned)\n @@ -285,6 +289,12 @@ return context.REQUEST.RESPONSE.redirect(redirect_url)\n <none/> </value> </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>_params</string> </key> <value> <string>dialog_method, dialog_id, dialog_category=\'\', enable_pickle=0, **kw</string> </value> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index 6843ba3a4a..196c595d28 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -1,3 +1,6 @@ +2006-09-14 Aurel +* fix removeUnpickableObject in Base_callDialogMethod to take listbox into account + 2006-09-13 Kevin * Fix developper mode rendering bug. * erp5.js is needed in web mode by admin toolbox which display context_box_render. diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index cde50ca2fd..a5b5e0f805 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -179 \ No newline at end of file +181 \ No newline at end of file -- 2.30.9