Define render_prefix for each report section.

Fix popReport call.
Improve XML indentation.

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

bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_list.xml

@@ -57,7 +57,8 @@
       <table:table table:style-name=\'ta1\' table:print=\'false\' tal:attributes="table:name here/getTitle" >\n
         <tal:block metal:define-macro="form_layout"\n
                     tal:define="dummy python: request.set(\'here\', here);\n
-                                listbox form/listbox">\n
+                                listbox form/listbox | nothing;">\n
+         <tal:block tal:condition="listbox">\n
             <tal:block metal:use-macro="here/listbox_ods_macro/macros/listbox">\n
               <tal:block metal:fill-slot="list_header">\n
                 <tal:block tal:repeat="column_item listboxline/getColumnItemList"> \n
@@ -100,6 +101,7 @@
               </tal:block>\n
             </tal:block>\n
         </tal:block>\n
+        </tal:block>\n
       </table:table>\n
     </office:spreadsheet>\n
   </office:body>\n

bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml

@@ -172,7 +172,7 @@ dQEAAAAA</string> </value>
                   <draw:frame draw:z-index="0" draw:style-name="gr1" svg:x="0.2cm" svg:y="0.2cm" svg:width="7.996cm" svg:height="6.999cm"\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
                 </table:table-cell>\n
               </table:table-row>\n

bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml

@@ -51,7 +51,8 @@
   <office:spreadsheet>\n
 \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="render_prefix render_prefix | nothing;\n
+               listboxline_list python: listbox.get_value(\'default\', render_format=\'list\', REQUEST=request, render_prefix=render_prefix);\n
                DateTime nocall: modules/DateTime/DateTime;\n
                selection_name python: listbox.get_value(\'selection_name\', REQUEST=request);\n
                editable_columns python: listbox.get_value(\'editable_columns\', REQUEST=request);\n

bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml

@@ -79,7 +79,9 @@
                 <tal:block tal:repeat="report_item report_item_list">\n
                   <tal:block metal:define-macro="make_report_item_table"\n
                              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
                         <table:table-row table:style-name=\'ro2\'>\n
@@ -105,9 +107,9 @@
                           </tal:block>\n
                         </tal:block>\n
                       </tal:block>\n
-                  <tal:block tal:define="portal_object here/portal_url/getPortalObject;\n
-                                         dummy python:report_item.popReport(portal_object)"/>\n
                     </tal:block>\n
+                    <tal:block tal:define="portal_object here/portal_url/getPortalObject;\n
+                                           dummy python:report_item.popReport(portal_object, render_prefix=render_prefix)"/>\n
                   </tal:block>\n
                 </tal:block>\n
               </tal:block>\n

bt5/erp5_ods_style/bt/revision

-173
\ No newline at end of file
+175
\ No newline at end of file