[Erp5-report] r25543 - in /erp5/trunk/bt5/erp5_documentation: SkinTemplateItem/portal_skins...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 12 15:29:51 CET 2009
Author: jm
Date: Thu Feb 12 15:29:36 2009
New Revision: 25543
URL: http://svn.erp5.org?rev=25543&view=rev
Log:
Fix generation of ODT reports:
* Do not store objects in selections.
* ReportSection requires listboxes to be named 'listbox'
Added:
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml (with props)
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml (with props)
Modified:
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml
erp5/trunk/bt5/erp5_documentation/bt/revision
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml?rev=25543&r1=25542&r2=25543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixClassMethodList.xml [utf8] Thu Feb 12 15:29:36 2009
@@ -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 @@
</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 @@
<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>
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml?rev=25543&r1=25542&r2=25543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getAppendixPropertySheetList.xml [utf8] Thu Feb 12 15:29:36 2009
@@ -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 @@
</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 @@
<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>
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml?rev=25543&r1=25542&r2=25543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml [utf8] Thu Feb 12 15:29:36 2009
@@ -259,9 +259,11 @@
)\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 @@
)\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
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml?rev=25543&r1=25542&r2=25543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view.xml [utf8] Thu Feb 12 15:29:36 2009
@@ -68,7 +68,7 @@
<key> <string>bottom</string> </key>
<value>
<list>
- <string>class_method_listbox</string>
+ <string>listbox</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml?rev=25543&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml (added)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml [utf8] Thu Feb 12 15:29:36 2009
@@ -1,0 +1,148 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>columns</string>
+ <string>list_method</string>
+ <string>url_columns</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>id</string>
+ <string>id</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>class_method_listbox</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>DocumentationHelper_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>method_name</string> </key>
+ <value> <string>DocumentationHelper_getAppendixClassMethodList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Propchange: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixClassMethod_view/listbox.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml?rev=25543&r1=25542&r2=25543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view.xml [utf8] Thu Feb 12 15:29:36 2009
@@ -68,7 +68,7 @@
<key> <string>bottom</string> </key>
<value>
<list>
- <string>property_sheet_listbox</string>
+ <string>listbox</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml?rev=25543&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml (added)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml [utf8] Thu Feb 12 15:29:36 2009
@@ -1,0 +1,175 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ <string>description</string>
+ <string>columns</string>
+ <string>list_method</string>
+ <string>selection_name</string>
+ <string>url_columns</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>id</string>
+ <string>Id</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_listbox</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string>property_sheet_selection</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Property Sheet</string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>method_name</string> </key>
+ <value> <string>DocumentationHelper_getAppendixPropertySheetList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Propchange: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/PortalTypeDocumentationHelperAppendixPropertySheet_view/listbox.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: erp5/trunk/bt5/erp5_documentation/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/bt/revision?rev=25543&r1=25542&r2=25543&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_documentation/bt/revision [utf8] Thu Feb 12 15:29:36 2009
@@ -1,1 +1,1 @@
-163
+165
More information about the Erp5-report
mailing list