[Erp5-report] r25911 - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Mar  6 18:10:00 2009
New Revision: 25911

URL: http://svn.erp5.org?rev=25911&view=rev
Log:
Generate some valid ODF in the case of domain tree

Modified:
    erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml
    erp5/trunk/bt5/erp5_odt_style/bt/revision

Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml?rev=25911&r1=25910&r2=25911&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/listbox_odt_macro.xml [utf8] Fri Mar  6 18:10:00 2009
@@ -101,20 +101,6 @@
                  is_report_tree_mode selection/report_tree_mode | nothing;" >\n
 \n
            <tal:block tal:condition="python: len(listboxline_list) > 1" >\n
-            <tal:block tal:condition="python: is_domain_tree_mode">\n
-               <tal:block tal:define="domain_list python: selection.getDomainList()"\n
-                   tal:condition="python: len(domain_list) > 0" >\n
-                 <table:table table:style-name=\'listbox-table\' table:name=\'listbox-table\'>\n
-                   <table:table-column table:style-name=\'listbox-table.A\'/>\n
-                   <table:table-row>\n
-                     <table:table-cell table:style-name=\'listbox-table.A1\' office:value-type=\'string\'>\n
-                       <text:p text:style-name=\'listbox-header\' tal:content="python: domain_list[-1]" />\n
-                     </table:table-cell>\n
-                   </table:table-row>\n
-                 </table:table>\n
-               </tal:block>\n
-              </tal:block>\n
-\n
                <table:table table:style-name=\'listbox-table\' table:name=\'listbox-table\'>\n
                 <tal:block tal:repeat="column_item python:listboxline_list[0].getColumnItemList()">\n
                  <table:table-column table:style-name=\'listbox-table.A\'/>\n
@@ -147,6 +133,15 @@
 \n
                    <tal:block tal:condition="python: listboxline.isTitleLine()">\n
                      <table:table-header-rows>\n
+                       <table:table-row>\n
+                         <table:table-cell table:style-name=\'listbox-table.A1\' \n
+                                           tal:attributes="table:number-columns-spanned python: len(listboxline.getColumnItemList())" \n
+                                           office:value-type=\'string\'>\n
+                            <text:p tal:condition=\'is_domain_tree_mode\'\n
+                                   text:style-name=\'listbox-header\'\n
+                                   tal:content="python: selection.getDomain() is not None and selection.getDomain().asDomainItemDict().values()[-1].getTitle() or \'\'"/>\n
+                         </table:table-cell>\n
+                       </table:table-row>\n
                        <table:table-row>\n
                          <table:table-cell table:style-name=\'listbox-table.A1\' \n
                                            tal:attributes="table:number-columns-spanned python: len(listboxline.getColumnItemList())" \n

Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=25911&r1=25910&r2=25911&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision [utf8] Fri Mar  6 18:10:00 2009
@@ -1,1 +1,1 @@
-69
+71