[Erp5-report] r28816 - /erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_od...

[nobody at svn.erp5.org]

Author: yusuke
Date: Fri Sep  4 09:33:31 2009
New Revision: 28816

URL: http://svn.erp5.org?rev=28816&view=rev
Log:
update to support ReportBox.

Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml?rev=28816&r1=28815&r2=28816&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml [utf8] Fri Sep  4 09:33:31 2009
@@ -51,12 +51,22 @@
     <office:spreadsheet>\n
 \n
       <tal:block tal:define="rendered_report_item_list rendered_report_item_list | python:[];\n
-                             report_item_list python: rendered_report_item_list or report_method();\n
+                             report_item_list python: rendered_report_item_list or [];\n
                              dummy python: request.set(\'here\', here);\n
                              global sheet_per_reportsection python: int(request.get(\'sheet_per_report_section\', 0));\n
                              global column_len python: 5">\n
                              <!-- TODO: calculate column_len based on the first listbox (or selection_column if exists)-->\n
-\n
+        <tal:block tal:condition="not: report_item_list">\n
+          <tal:block tal:condition="python: form.meta_type == \'ERP5 Report\'">\n
+            <tal:block tal:define="dummy python: report_item_list.extend(report_method())" />\n
+          </tal:block>\n
+          <tal:block tal:condition="python: form.meta_type == \'ERP5 Form\'">\n
+            <tal:block tal:repeat="reportbox python: [field for field in form.get_fields()\n
+                                                      if field.getRecursiveTemplateField().meta_type == \'ReportBox\']">\n
+              <tal:block tal:define="dummy python: report_item_list.extend(reportbox.render())" />\n
+            </tal:block>\n
+          </tal:block>\n
+        </tal:block>\n
         <tal:block tal:define="portal_object here/portal_url/getPortalObject">\n
           <tal:block tal:condition="not: sheet_per_reportsection">\n
             <table:table tal:attributes="table:name python:unicode(here.getProperty(\'title\'), \'utf8\')" i18n:attributes="table:name">\n