[Erp5-report] r34759 daniele - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: daniele
Date: Fri Apr 23 17:52:00 2010
New Revision: 34759

URL: http://svn.erp5.org?rev=34759&view=rev
Log:
To have a valid format change the column length to privilege the
selections_columns and to have a minumun of 1.

Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
    erp5/trunk/bt5/erp5_ods_style/bt/revision

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml?rev=34759&r1=34758&r2=34759&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml [utf8] Fri Apr 23 17:52:00 2010
@@ -102,8 +102,8 @@
             tal:condition="python: field.get_value(\'title\')">\n
           <!-- if the group bottom there isn\'t a title -->\n
           <table:table-cell table:number-rows-spanned=\'1\'\n
-              table:style-name=\'report-content-heading2-with-lines\'\n
-            tal:attributes="table:number-columns-spanned python:group == \'bottom\' and column_len or column_len-1"\n
+            table:style-name=\'report-content-heading2-with-lines\'\n
+            tal:attributes="table:number-columns-spanned python:group == \'bottom\' and column_len or max(column_len-1, 1)"\n
             office:value-type=\'string\'\n
             tal:define="value python: field.get_value(\'default\')">\n
             <tal:block tal:condition="python: same_type(value, []) or same_type(value, ())">\n

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=34759&r1=34758&r2=34759&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml [utf8] Fri Apr 23 17:52:00 2010
@@ -112,16 +112,14 @@
           <tal:block tal:define="global field_list python: form.get_fields_in_group(group)"/>\n
           <tal:block tal:condition="python:len(field_list) &gt; 0">\n
             <tal:block tal:define="global column_len python: 5"/>\n
+            <tal:block tal:repeat="field python:field_list">\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\');\n
+                                       global column_len python: max(column_len, len(column_list))" />\n
+              </tal:block>\n
+            </tal:block>\n
             <tal:block tal:condition="report_item | nothing">\n
-               <tal:block tal:define="global column_len python: report_item.selection_columns and len(report_item.selection_columns) or 0;"/>\n
-            </tal:block>\n
-            <tal:block tal:condition="python: column_len &lt; 6">\n
-              <tal:block tal:repeat="field python:field_list">\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\');\n
-                                         global column_len python: max(column_len, len(column_list))" />\n
-                </tal:block>\n
-              </tal:block>\n
+               <tal:block tal:define="global column_len python: report_item.selection_columns and len(report_item.selection_columns) or column_len;"/>\n
             </tal:block>\n
             <!-- Display field -->\n
             <tal:block tal:repeat="field python:field_list">\n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=34759&r1=34758&r2=34759&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision [utf8] Fri Apr 23 17:52:00 2010
@@ -1,1 +1,1 @@
-232
+233