[Erp5-report] r28813 - /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateIte...

[nobody at svn.erp5.org]

Author: yusuke
Date: Fri Sep  4 09:32:40 2009
New Revision: 28813

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

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/report_view.xml

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/report_view.xml?rev=28813&r1=28812&r2=28813&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/report_view.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/report_view.xml [utf8] Fri Sep  4 09:32:40 2009
@@ -46,8 +46,18 @@
     <tal:block  metal:use-macro="here/view_main/macros/master">\n
       <tal:block metal:fill-slot="main">\n
         <tal:block metal:use-macro="here/form_render/macros/master" />\n
-        <tal:block tal:define="portal_object here/getPortalObject">\n
-          <tal:block tal:repeat="report_item report_method">\n
+        <tal:block tal:define="portal_object here/getPortalObject;\n
+                               report_item_list python:[]">\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 tal:repeat="report_item report_item_list">\n
             <tal:block tal:define="here python: report_item.getObject(portal_object);\n
                                    render_prefix python: \'x%s\' % (repeat[\'report_item\'].index, );\n
                                    dummy python: report_item.pushReport(portal_object, render_prefix=render_prefix)">\n