[Erp5-report] r19844 - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Mar 13 13:54:49 2008
New Revision: 19844

URL: http://svn.erp5.org?rev=19844&view=rev
Log:
Generate something valid when we have a field in bottom which is not a listbox nor matrixbox (and no other field in the form)

Added:
    erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_local_role_key_list
    erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_role_key_list
Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.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=19844&r1=19843&r2=19844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml Thu Mar 13 13:54:49 2008
@@ -57,16 +57,23 @@
     <!-- Render the field in the bottom group. `field` must be defined.\n
     The field in the bottom group, can be ListBoxField, MatrixBoxField or a ProxyField to one of thoses.\n
     -->\n
-    <tal:block metal:define-macro="bottom_group_field">\n
-      <tal:block tal:condition="python: field.meta_type == \'MatrixBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'MatrixBox\')">\n
+    <tal:block metal:define-macro="bottom_group_field"\n
+               tal:define="field_meta_type python: field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type or field.meta_type">\n
+      <tal:block tal:condition="python: field_meta_type == \'MatrixBox\'">\n
         <tal:block  tal:define="matrixbox python:field;">\n
           <tal:block metal:use-macro="here/matrixbox_ods_macro/macros/matrixbox" />\n
         </tal:block>\n
       </tal:block>\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:condition="python: field_meta_type == \'ListBox\'">\n
         <tal:block  tal:define="listbox python:field;" >\n
           <tal:block metal:use-macro="here/listbox_ods_macro/macros/listbox" />\n
         </tal:block>\n
+      </tal:block>\n
+      <tal:block tal:condition="python: field_meta_type not in (\'ListBox\', \'MatrixBox\')"\n
+                 tal:define="warning_log python: context.log(\'field_ods_macro ignored field:%s\' % field)">\n
+        <table:table-row table:style-name="ro2">\n
+          <table:table-cell/>\n
+        </table:table-row>\n
       </tal:block>\n
     </tal:block>\n
 \n

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=19844&r1=19843&r2=19844&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision Thu Mar 13 13:54:49 2008
@@ -1,1 +1,1 @@
-124
+128

Added: erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_local_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_local_role_key_list?rev=19844&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_role_key_list?rev=19844&view=auto
==============================================================================
    (empty)