From 18f55faedf0ebe2f9fedf5d7c9fb0cd0e981738f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Thu, 13 Mar 2008 12:54:49 +0000
Subject: [PATCH] Generate something valid when we have a field in bottom which
 is not a listbox nor matrixbox (and no other field in the form)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19844 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_ods_style/field_ods_macro.xml | 13 ++++++++++---
 bt5/erp5_ods_style/bt/revision                      |  2 +-
 .../bt/template_catalog_local_role_key_list         |  0
 .../bt/template_catalog_role_key_list               |  0
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 bt5/erp5_ods_style/bt/template_catalog_local_role_key_list
 create mode 100644 bt5/erp5_ods_style/bt/template_catalog_role_key_list

diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
index cf1d01f7fd..7b1d3fab51 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
@@ -57,17 +57,24 @@
     <!-- 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
 \n
diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision
index a09fd8ad47..b854a29217 100644
--- a/bt5/erp5_ods_style/bt/revision
+++ b/bt5/erp5_ods_style/bt/revision
@@ -1 +1 @@
-124
\ No newline at end of file
+128
\ No newline at end of file
diff --git a/bt5/erp5_ods_style/bt/template_catalog_local_role_key_list b/bt5/erp5_ods_style/bt/template_catalog_local_role_key_list
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bt5/erp5_ods_style/bt/template_catalog_role_key_list b/bt5/erp5_ods_style/bt/template_catalog_role_key_list
new file mode 100644
index 0000000000..e69de29bb2
-- 
2.30.9