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

[nobody at svn.erp5.org]

Author: rie
Date: Tue Sep  4 18:01:10 2007
New Revision: 16048

URL: http://svn.erp5.org?rev=16048&view=rev
Log:
modifies report-view, add validation of 'field_list'

Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
    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/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml?rev=16048&r1=16047&r2=16048&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml Tue Sep  4 18:01:10 2007
@@ -67,9 +67,11 @@
 \n
     <tal:block tal:define="field_list python:form.get_fields_in_group(\'bottom\')">\n
       <tal:block tal:define="global column_len python:3"/>\n
-      <tal:block tal:define="field python:field_list[0]">\n
-        <tal:block tal:condition="python:field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n
-          <tal:block tal:define="column_list python: field.get_value(\'columns\'); global column_len python: len(column_list)" />\n
+      <tal:block tal:condition=\'field_list\'>\n
+        <tal:block tal:define="field python:field_list[0]">\n
+          <tal:block tal:condition="python:field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n
+            <tal:block tal:define="column_list python: field.get_value(\'columns\'); global column_len python: len(column_list)" />\n
+          </tal:block>\n
         </tal:block>\n
       </tal:block>\n
     </tal:block>\n

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=16048&r1=16047&r2=16048&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/report_view.xml Tue Sep  4 18:01:10 2007
@@ -62,7 +62,7 @@
       <tal:block tal:define="report_item_list python:report_method(); field_errors python: request.get(\'field_errors,{}\'); dummy python: request.set(\'here\', here);global sheet_per_reportsection python: int(request.get(\'sheet_per_report_section\', 0));global column_len python:3">\n
 \n
       <tal:block tal:define="portal_object here/portal_url/getPortalObject"> \n
-        <tal:block tal:condition="python: sheet_per_reportsection == 0">\n
+        <tal:block tal:condition="not: sheet_per_reportsection">\n
           <table:table tal:attributes="table:name python:here.getProperty(\'title\')">\n
             <tal:block tal:repeat="report_item report_item_list">\n
               <tal:block metal:define-macro="make_report_item_table" tal:define="here python:report_item.getObject(portal_object); dummy python:report_item.pushReport(portal_object)">\n
@@ -105,7 +105,7 @@
               </tal:block>\n
             </table:table>\n
           </tal:block>\n
-          <tal:block tal:condition="python: sheet_per_reportsection == 1">\n
+          <tal:block tal:condition="sheet_per_reportsection">\n
             <tal:block tal:repeat="report_item python: report_item_list">\n
               <tal:block tal:condition="python: report_item.getFormId()">\n
                 <table:table tal:attributes="table:name python: unicode(report_item.getTitle(), \'utf-8\')">\n