Propagate render_prefix in odt_style

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24646 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml

@@ -282,7 +282,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                                       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 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                               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 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                               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

bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml

@@ -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

bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml

@@ -248,7 +248,9 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                  <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 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                          <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

bt5/erp5_odt_style/bt/revision

-64
+65
\ No newline at end of file