From dd08c5b9f43584346030244665334bf37c76da12 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Tue, 14 Dec 2010 13:54:40 +0000 Subject: [PATCH] User might have selected gadgets in previous "Add Gadgets" dialog page. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41418 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../KnowledgePad_addBoxList.xml | 16 ++++++++++++---- bt5/erp5_knowledge_pad/bt/revision | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_addBoxList.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_addBoxList.xml index 8ca5938389..260487f079 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_addBoxList.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_addBoxList.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> </pickle> <pickle> <dictionary> @@ -59,6 +56,14 @@ cancel_url = kw.get(\'cancel_url\', None)\n active_pad_relative_url = kw.get(\'active_pad_relative_url\', None)\n knowledge_pad = context.restrictedTraverse(active_pad_relative_url)\n not_added_gadgets_mesage = None\n +\n +selection_name = context.REQUEST.get(\'list_selection_name\', None)\n +if selection_name is not None:\n + # maybe user already selected them in a previous page in a listbox selection\n + portal_selection = context.portal_selections\n + params = portal_selection.getSelectionParamsFor(selection_name, {})\n + uids.extend(params.get(\'uids\', []))\n +\n if len(uids):\n for uid in uids:\n gadget = context.portal_catalog(uid=uid)[0]\n @@ -134,6 +139,9 @@ else:\n <string>active_pad_relative_url</string> <string>knowledge_pad</string> <string>not_added_gadgets_mesage</string> + <string>selection_name</string> + <string>portal_selection</string> + <string>params</string> <string>len</string> <string>_getiter_</string> <string>uid</string> diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision index 7703a12954..06834d4380 100644 --- a/bt5/erp5_knowledge_pad/bt/revision +++ b/bt5/erp5_knowledge_pad/bt/revision @@ -1 +1 @@ -656 \ No newline at end of file +657 \ No newline at end of file -- 2.30.9