[Erp5-report] r24646 - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Nov 20 10:38:14 CET 2008
Author: nicolas
Date: Thu Nov 20 10:38:13 2008
New Revision: 24646
URL: http://svn.erp5.org?rev=24646&view=rev
Log:
Propagate render_prefix in odt_style
Modified:
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
erp5/trunk/bt5/erp5_odt_style/bt/revision
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml?rev=24646&r1=24645&r2=24646&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml [utf8] Thu Nov 20 10:38:13 2008
@@ -282,7 +282,7 @@
text:anchor-type="paragraph"\n
tal:attributes="svg:height python:str(height_graph)+\'cm\';\n
svg:width python:str(width_graph)+\'cm\'"\n
- tal:content="structure python: field.render_odf()">\n
+ tal:content="structure python: field.render_odf(render_prefix=render_prefix)">\n
</draw:frame>\n
</text:p>\n
</tal:block>\n
@@ -343,7 +343,7 @@
text:anchor-type="paragraph"\n
tal:attributes="svg:height python:height;\n
svg:width python:width">\n
- <tal:block tal:replace="structure python: field.render_odf()"/>\n
+ <tal:block tal:replace="structure python: field.render_odf(render_prefix=render_prefix)"/>\n
</draw:frame>\n
</text:p>\n
\n
@@ -422,7 +422,7 @@
text:anchor-type="paragraph"\n
tal:attributes="svg:height python:height;\n
svg:width python:width">\n
- <tal:block tal:replace="structure python: field.render_odf()"/>\n
+ <tal:block tal:replace="structure python: field.render_odf(render_prefix=render_prefix)"/>\n
</draw:frame>\n
</text:p>\n
</tal:block>\n
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml?rev=24646&r1=24645&r2=24646&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml [utf8] Thu Nov 20 10:38:13 2008
@@ -90,7 +90,7 @@
</text:sequence-decls>\n
***** ########### listbox: must define the field listbox before calling this macro ! ########### *****\n
<tal:block metal:define-macro="listbox">\n
- <tal:block tal:define="listboxline_list python:listbox.get_value(\'default\', render_format=\'list\', REQUEST=request);\n
+ <tal:block tal:define="listboxline_list python:listbox.get_value(\'default\', render_format=\'list\', REQUEST=request, render_prefix=render_prefix);\n
selection_name python:listbox.get_value(\'selection_name\', REQUEST=request);\n
editable_columns python:listbox.get_value(\'editable_columns\', REQUEST=request);\n
untranslatable_columns_dict python:dict([(column[0],1) for column in listbox.get_value(\'untranslatable_columns\', REQUEST=request)]);\n
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml?rev=24646&r1=24645&r2=24646&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml [utf8] Thu Nov 20 10:38:13 2008
@@ -248,7 +248,9 @@
<tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
<tal:block tal:repeat="report_item report_item_list">\n
<tal:block tal:define="here python:report_item.getObject(portal_object);\n
- dummy python:report_item.pushReport(portal_object)">\n
+ render_prefix python: \'x%s\' % (repeat[\'report_item\'].index, );\n
+ dummy python:report_item.pushReport(portal_object,\n
+ render_prefix=render_prefix)">\n
<tal:block metal:define-macro="render_report_section">\n
<tal:block tal:condition="report_item/getTitle">\n
<text:p\n
@@ -266,8 +268,9 @@
<tal:block metal:use-macro="form/form_list/macros/form_layout"/>\n
</tal:block></tal:block></tal:block>\n
</tal:block>\n
+ <tal:block tal:define="dummy python:report_item.popReport(portal_object,\n
+ render_prefix=render_prefix)"/>\n
</tal:block>\n
- <tal:block tal:define="dummy python:report_item.popReport(portal_object)"/>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=24646&r1=24645&r2=24646&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision [utf8] Thu Nov 20 10:38:13 2008
@@ -1,1 +1,1 @@
-64
+65
More information about the Erp5-report
mailing list