From f5830ba3e4137050addb98b8835e792b8fbce20a Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Thu, 12 Feb 2009 14:30:00 +0000 Subject: [PATCH] Fix generation of ODT reports: * Do not store objects in selections. * ReportSection requires listboxes to be named 'listbox' git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25544 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...entationHelper_getAppendixClassMethodList.xml | 15 +++++---------- ...tationHelper_getAppendixPropertySheetList.xml | 16 +++++----------- ...ntationHelper_getDocumentationSectionList.xml | 12 ++++++++---- ...cumentationHelperAppendixClassMethod_view.xml | 2 +- .../{class_method_listbox.xml => listbox.xml} | 2 +- ...mentationHelperAppendixPropertySheet_view.xml | 2 +- .../{property_sheet_listbox.xml => listbox.xml} | 2 +- bt5/erp5_documentation/bt/revision | 2 +- 8 files changed, 23 insertions(+), 30 deletions(-) rename bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/{class_method_listbox.xml => listbox.xml} (98%) rename bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/{property_sheet_listbox.xml => listbox.xml} (98%) diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml index 7d6be76530..aa41f7359b 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml @@ -61,12 +61,9 @@ def compareId(a, b):\n return cmp(normalise(a.id), normalise(b.id))\n \n -class_method_list = kw["class_method_list"]\n -obj = kw["obj"]\n -\n result = map(\n - lambda x: obj.asContext(id=x),\n - class_method_list \n + lambda x: context.asContext(id=x),\n + class_method_list\n )\n result.sort(compareId)\n return result\n @@ -80,7 +77,7 @@ return result\n </item> <item> <key> <string>_params</string> </key> - <value> <string>**kw</string> </value> + <value> <string>class_method_list, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -100,18 +97,16 @@ return result\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>class_method_list</string> <string>kw</string> <string>normalise</string> <string>compareId</string> - <string>_getitem_</string> - <string>class_method_list</string> - <string>obj</string> <string>map</string> <string>result</string> <string>_getattr_</string> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml index a96b621685..41399a6142 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml @@ -61,13 +61,9 @@ def compareId(a, b):\n return cmp(normalise(a.id), normalise(b.id))\n \n -property_sheet_list = kw["property_sheet_list"]\n -\n -obj = kw["obj"]\n -\n result = map(\n - lambda x: obj.asContext(id=x),\n - property_sheet_list \n + lambda x: context.asContext(id=x),\n + property_sheet_list\n )\n result.sort(compareId)\n return result\n @@ -81,7 +77,7 @@ return result\n </item> <item> <key> <string>_params</string> </key> - <value> <string>**kw</string> </value> + <value> <string>property_sheet_list, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -101,18 +97,16 @@ return result\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>property_sheet_list</string> <string>kw</string> <string>normalise</string> <string>compareId</string> - <string>_getitem_</string> - <string>property_sheet_list</string> - <string>obj</string> <string>map</string> <string>result</string> <string>_getattr_</string> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml index fd08686233..e4d906f807 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml @@ -259,9 +259,11 @@ if portal_skin is not None and portal_skin=="ODT":\n )\n result.append(\n ReportSection(\n + path=context.getPortalObject().portal_classes.getRelativeUrl(),\n + method_id=\'getDocumentationHelper\',\n + param_list=(section.getClassName(), uri),\n form_id=\'PortalTypeDocumentationHelperAppendixClassMethod_view\',\n - selection_params=dict(class_method_list=classmethod, obj=uri_object),\n - selection_name=\'class_method_selection\',\n + selection_params=dict(class_method_list=classmethod),\n listbox_display_mode=\'FlatListMode\')\n )\n if propertysheet.keys() != []:\n @@ -283,9 +285,11 @@ if portal_skin is not None and portal_skin=="ODT":\n )\n result.append(\n ReportSection(\n + path=context.getPortalObject().portal_classes.getRelativeUrl(),\n + method_id=\'getDocumentationHelper\',\n + param_list=(section.getClassName(), uri),\n form_id=\'PortalTypeDocumentationHelperAppendixPropertySheet_view\',\n - selection_params=dict(property_sheet_list=propertysheet.keys(), obj=uri_object),\n - selection_name=\'property_sheet_selection\',\n + selection_params=dict(property_sheet_list=propertysheet.keys()),\n listbox_display_mode=\'FlatListMode\')\n )\n class_name = \'PortalTypePropertySheetDocumentationHelper\'\n diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml index 65fa164ee8..b3b6ec20cc 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml @@ -68,7 +68,7 @@ <key> <string>bottom</string> </key> <value> <list> - <string>class_method_listbox</string> + <string>listbox</string> </list> </value> </item> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/class_method_listbox.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml similarity index 98% rename from bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/class_method_listbox.xml rename to bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml index 1681e9bdaa..416c8dbcf1 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/class_method_listbox.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml @@ -21,7 +21,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>class_method_listbox</string> </value> + <value> <string>listbox</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml index da0632bc61..0ba45d7507 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml @@ -68,7 +68,7 @@ <key> <string>bottom</string> </key> <value> <list> - <string>property_sheet_listbox</string> + <string>listbox</string> </list> </value> </item> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/property_sheet_listbox.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml similarity index 98% rename from bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/property_sheet_listbox.xml rename to bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml index cccdebb4b4..22f41fe930 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/property_sheet_listbox.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml @@ -24,7 +24,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>property_sheet_listbox</string> </value> + <value> <string>listbox</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_documentation/bt/revision b/bt5/erp5_documentation/bt/revision index 5755659621..59f3135037 100644 --- a/bt5/erp5_documentation/bt/revision +++ b/bt5/erp5_documentation/bt/revision @@ -1 +1 @@ -163 \ No newline at end of file +165 \ No newline at end of file -- 2.30.9