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 cf1d01f7fd374931acb0ad6794b830a918123f43..7b1d3fab51a5aa89c0786a5423a43a2f0f698991 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 a09fd8ad47268facfe50ea952d980dc5627594a2..b854a292176003137b48b2f2eb6267c6c3085c9b 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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391