diff --git a/README.md b/README.md index 44402c87f20..93de7513a7d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ addon | version | maintainers | summary [auditlog](auditlog/) | 19.0.1.0.1 | | Audit Log [base_exception](base_exception/) | 19.0.1.0.0 | hparfr sebastienbeau | This module provide an abstract model to manage customizable exceptions to be applied on different models (sale order, invoice, ...) [base_technical_user](base_technical_user/) | 19.0.1.0.0 | | Add a technical user parameter on the company -[base_view_inheritance_extension](base_view_inheritance_extension/) | 19.0.1.0.0 | | Adds more operators for view inheritance +[base_view_inheritance_extension](base_view_inheritance_extension/) | 19.0.1.0.0 | hbrunn | Adds more operators for view inheritance [bus_alt_connection](bus_alt_connection/) | 19.0.1.0.0 | | Needed when using PgBouncer as a connection pooler [database_cleanup](database_cleanup/) | 19.0.1.0.1 | | Database cleanup [field_vector](field_vector/) | 19.0.1.0.0 | lmignon | New specialized field to store vector data diff --git a/base_view_inheritance_extension/README.rst b/base_view_inheritance_extension/README.rst index 4cb92d97517..3bab25802d3 100644 --- a/base_view_inheritance_extension/README.rst +++ b/base_view_inheritance_extension/README.rst @@ -11,7 +11,7 @@ Extended view inheritance !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:976ed65f6e7fc64e0500db2d119af953448af9e027f2a217cc544cb9d9d19319 + !! source digest: sha256:9089555b5aea01b23ff4a0350d6fd69589d63f1beb4e272ed5a96eebf05b2a81 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png @@ -76,6 +76,39 @@ conditional changes** $domain_to_add +**Wrap loose text in an element for further processing** + +.. code:: xml + + + + +which transforms + +.. code:: xml + + + + plain text 1 + + plain text2 + + + +to + +.. code:: xml + + + + plain text 1 + +
plain text2
+ + + +making those texts accessible for further operations + Known issues / Roadmap ====================== @@ -102,7 +135,7 @@ Authors Contributors ------------ -- Holger Brunn +- Holger Brunn - Ronald Portier - `Tecnativa `__: @@ -129,6 +162,14 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. +.. |maintainer-hbrunn| image:: https://github.com/hbrunn.png?size=40px + :target: https://github.com/hbrunn + :alt: hbrunn + +Current `maintainer `__: + +|maintainer-hbrunn| + This module is part of the `OCA/server-tools `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_view_inheritance_extension/__manifest__.py b/base_view_inheritance_extension/__manifest__.py index d27da32ee46..5219ab7b857 100644 --- a/base_view_inheritance_extension/__manifest__.py +++ b/base_view_inheritance_extension/__manifest__.py @@ -12,4 +12,5 @@ "website": "https://github.com/OCA/server-tools", "depends": ["base"], "demo": ["demo/ir_ui_view.xml"], + "maintainers": ["hbrunn"], } diff --git a/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot b/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot index a351dcde337..ecb0b4f08d9 100644 --- a/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot +++ b/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot @@ -27,3 +27,21 @@ msgstr "" #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "View" msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" diff --git a/base_view_inheritance_extension/i18n/ca.po b/base_view_inheritance_extension/i18n/ca.po index ed7631af066..c5437792e62 100644 --- a/base_view_inheritance_extension/i18n/ca.po +++ b/base_view_inheritance_extension/i18n/ca.po @@ -19,18 +19,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "Empresa de " - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" msgstr "" #. module: base_view_inheritance_extension @@ -38,6 +33,27 @@ msgstr "" msgid "View" msgstr "" +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "Empresa de " + #~ msgid "ir.ui.view" #~ msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/de.po b/base_view_inheritance_extension/i18n/de.po index fbe56c6ec8a..f0793173d17 100644 --- a/base_view_inheritance_extension/i18n/de.po +++ b/base_view_inheritance_extension/i18n/de.po @@ -19,23 +19,36 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" msgstr "" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" +#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view +msgid "View" msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view -msgid "View" +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" msgstr "" #~ msgid "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/es.po b/base_view_inheritance_extension/i18n/es.po index 63d575e51bc..38157ca3d94 100644 --- a/base_view_inheritance_extension/i18n/es.po +++ b/base_view_inheritance_extension/i18n/es.po @@ -20,24 +20,46 @@ msgstr "" "X-Generator: Weblate 4.17\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "Formulario de socio" - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" -msgstr "Números de teléfono" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" +msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" -msgstr "Búsqueda inteligente" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" +msgstr "" #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "View" msgstr "Vista" +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "Formulario de socio" + +#~ msgid "Phone numbers" +#~ msgstr "Números de teléfono" + +#~ msgid "Smart Search" +#~ msgstr "Búsqueda inteligente" + #~ msgid "ir.ui.view" #~ msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/es_AR.po b/base_view_inheritance_extension/i18n/es_AR.po index f36856cd13d..11df5002fcb 100644 --- a/base_view_inheritance_extension/i18n/es_AR.po +++ b/base_view_inheritance_extension/i18n/es_AR.po @@ -17,21 +17,43 @@ msgstr "" "X-Generator: Weblate 4.17\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "Contacto desde" - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" -msgstr "Números de teléfono" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" +msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" -msgstr "Búsqueda Inteligente" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" +msgstr "" #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "View" msgstr "Vista" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "Contacto desde" + +#~ msgid "Phone numbers" +#~ msgstr "Números de teléfono" + +#~ msgid "Smart Search" +#~ msgstr "Búsqueda Inteligente" diff --git a/base_view_inheritance_extension/i18n/hr.po b/base_view_inheritance_extension/i18n/hr.po index 60cbb4746b5..123790c8e76 100644 --- a/base_view_inheritance_extension/i18n/hr.po +++ b/base_view_inheritance_extension/i18n/hr.po @@ -21,18 +21,13 @@ msgstr "" "X-Generator: Weblate 4.14.1\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "Forma partnera" - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" -msgstr "Brojevi telefona" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" +msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" msgstr "" #. module: base_view_inheritance_extension @@ -40,5 +35,29 @@ msgstr "" msgid "View" msgstr "Pogled" +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "Forma partnera" + +#~ msgid "Phone numbers" +#~ msgstr "Brojevi telefona" + #~ msgid "ir.ui.view" #~ msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/it.po b/base_view_inheritance_extension/i18n/it.po index 07088e18596..85bf259d49c 100644 --- a/base_view_inheritance_extension/i18n/it.po +++ b/base_view_inheritance_extension/i18n/it.po @@ -20,24 +20,46 @@ msgstr "" "X-Generator: Weblate 4.17\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "Form Partner" - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" -msgstr "Numeri di telefono" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" +msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" -msgstr "Ricerca intelligente" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" +msgstr "" #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "View" msgstr "Vista" +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "Form Partner" + +#~ msgid "Phone numbers" +#~ msgstr "Numeri di telefono" + +#~ msgid "Smart Search" +#~ msgstr "Ricerca intelligente" + #~ msgid "ir.ui.view" #~ msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/i18n/nl.po b/base_view_inheritance_extension/i18n/nl.po index b6e2b796f0b..9526a338066 100644 --- a/base_view_inheritance_extension/i18n/nl.po +++ b/base_view_inheritance_extension/i18n/nl.po @@ -17,21 +17,43 @@ msgstr "" "X-Generator: Weblate 5.10.4\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "Partner formulier" - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" -msgstr "Telefoon nummers" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" +msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" -msgstr "Slim zoeken" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" +msgstr "" #. module: base_view_inheritance_extension #: model:ir.model,name:base_view_inheritance_extension.model_ir_ui_view msgid "View" msgstr "Weergave" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "Partner formulier" + +#~ msgid "Phone numbers" +#~ msgstr "Telefoon nummers" + +#~ msgid "Smart Search" +#~ msgstr "Slim zoeken" diff --git a/base_view_inheritance_extension/i18n/sl.po b/base_view_inheritance_extension/i18n/sl.po index b8fd545a680..c0a8129acc1 100644 --- a/base_view_inheritance_extension/i18n/sl.po +++ b/base_view_inheritance_extension/i18n/sl.po @@ -20,18 +20,13 @@ msgstr "" "n%100==4 ? 2 : 3);\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "Partnerjev obrazec" - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" msgstr "" #. module: base_view_inheritance_extension @@ -39,5 +34,26 @@ msgstr "" msgid "View" msgstr "" +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "Partnerjev obrazec" + #~ msgid "A new page" #~ msgstr "Nova stran" diff --git a/base_view_inheritance_extension/i18n/tr.po b/base_view_inheritance_extension/i18n/tr.po index bd0e58da97f..97ea42637c8 100644 --- a/base_view_inheritance_extension/i18n/tr.po +++ b/base_view_inheritance_extension/i18n/tr.po @@ -19,18 +19,13 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Partner form" -msgstr "İş ortağı formu" - -#. module: base_view_inheritance_extension -#: model_terms:ir.ui.view,arch_db:base_view_inheritance_extension.view_partner_simple_form -msgid "Phone numbers" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__display_name +msgid "Display Name" msgstr "" #. module: base_view_inheritance_extension -#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__smart_search -msgid "Smart Search" +#: model:ir.model.fields,field_description:base_view_inheritance_extension.field_ir_ui_view__id +msgid "ID" msgstr "" #. module: base_view_inheritance_extension @@ -38,6 +33,27 @@ msgstr "" msgid "View" msgstr "" +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext elements cannot have children" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: nothing found for expression %r" +msgstr "" + +#. module: base_view_inheritance_extension +#. odoo-python +#: code:addons/base_view_inheritance_extension/models/ir_ui_view.py:0 +msgid "wraptext: the only valid positions are 'text' or 'tail'" +msgstr "" + +#~ msgid "Partner form" +#~ msgstr "İş ortağı formu" + #~ msgid "ir.ui.view" #~ msgstr "ir.ui.view" diff --git a/base_view_inheritance_extension/models/ir_ui_view.py b/base_view_inheritance_extension/models/ir_ui_view.py index f5aa515ad43..fa16930cd49 100644 --- a/base_view_inheritance_extension/models/ir_ui_view.py +++ b/base_view_inheritance_extension/models/ir_ui_view.py @@ -9,6 +9,7 @@ from lxml import etree from odoo import api, models +from odoo.exceptions import ValidationError from odoo.fields import Domain @@ -83,6 +84,85 @@ def _get_inheritance_handler(self, node): handler = getattr(self, f"inheritance_handler_{node.tag}") return handler + @api.model + def inheritance_handler_wraptext(self, source, specs): + """Implement wraptext inheritance spec + + .. code-block:: xml + + + + Which transforms xml like + + .. code-block:: xml + + + + plain text + + + + + to + + .. code-block:: xml + + + + plain text + + + + + """ + if len(specs): + raise ValidationError(self.env._("wraptext elements cannot have children")) + + expression = specs.attrib.get("expr") + found = source.xpath(specs.attrib["expr"]) + if not found: + raise ValidationError( + self.env._("wraptext: nothing found for expression %r", expression) + ) + + found = found[0] + text_position = specs.attrib.get("position", "text") + if text_position not in ("text", "tail"): + raise ValidationError( + self.env._("wraptext: the only valid positions are 'text' or 'tail'") + ) + + wrapped = etree.Element(specs.attrib.get("element", "t")) + wrapped.text = getattr(found, text_position) + setattr(found, text_position, None) + + if self.env.context.get("edit_translations") and not wrapped.text: + # translation might have wrapped the text already in a element + # we wrap this element so that subsequent view manipulations find + # the wrapped element at the same position in the tree it would be at + # without translation + next_sibling = found.getnext() + + if ( + text_position == "text" + and len(found) + and found[0].attrib.get("data-oe-translation-state") + ): + wrapped.append(found[0]) + elif ( + text_position == "tail" + and next_sibling is not None + and next_sibling.attrib.get("data-oe-translation-state") + ): + wrapped.append(next_sibling) + + if text_position == "text": + found.insert(0, wrapped) + elif text_position == "tail": + found.addnext(wrapped) + + return source + @api.model def _get_inheritance_handler_attributes(self, node): handler = super().apply_inheritance_specs diff --git a/base_view_inheritance_extension/readme/CONTRIBUTORS.md b/base_view_inheritance_extension/readme/CONTRIBUTORS.md index af1f41160bd..8393673c0d7 100644 --- a/base_view_inheritance_extension/readme/CONTRIBUTORS.md +++ b/base_view_inheritance_extension/readme/CONTRIBUTORS.md @@ -1,4 +1,4 @@ -- Holger Brunn \<\> +- Holger Brunn \<\> - Ronald Portier \<\> - [Tecnativa](https://www.tecnativa.com): - Sergio Teruel diff --git a/base_view_inheritance_extension/readme/USAGE.md b/base_view_inheritance_extension/readme/USAGE.md index e4bda1aa927..eccdf027aec 100644 --- a/base_view_inheritance_extension/readme/USAGE.md +++ b/base_view_inheritance_extension/readme/USAGE.md @@ -30,3 +30,36 @@ conditional changes** $domain_to_add ``` + +**Wrap loose text in an element for further processing** + +``` xml + + +``` + +which transforms + +``` xml + + + plain text 1 + + plain text2 + + +``` + +to + +``` xml + + + plain text 1 + +
plain text2
+ + +``` + +making those texts accessible for further operations diff --git a/base_view_inheritance_extension/static/description/index.html b/base_view_inheritance_extension/static/description/index.html index e62c85d705e..611aa8047c1 100644 --- a/base_view_inheritance_extension/static/description/index.html +++ b/base_view_inheritance_extension/static/description/index.html @@ -372,7 +372,7 @@

Extended view inheritance

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:976ed65f6e7fc64e0500db2d119af953448af9e027f2a217cc544cb9d9d19319 +!! source digest: sha256:9089555b5aea01b23ff4a0350d6fd69589d63f1beb4e272ed5a96eebf05b2a81 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Mature License: LGPL-3 OCA/server-tools Translate me on Weblate Try me on Runboat

This module was written to make it simple to add custom operators for @@ -419,6 +419,32 @@

Usage

$domain_to_add </attribute> +

Wrap loose text in an element for further processing

+
+<wraptext expr="//some/node" position="text" element="span" />
+<wraptext expr="//some/node/other_node" position="tail" element="div" />
+
+

which transforms

+
+<some>
+    <node>
+        plain text 1
+        <other_node />
+        plain text2
+    </node>
+</some>
+
+

to

+
+<some>
+    <node>
+        <span>plain text 1</span>
+        <other_node />
+        <div>plain text2</div>
+    </node>
+</some>
+
+

making those texts accessible for further operations

Known issues / Roadmap

@@ -445,7 +471,7 @@

Authors

Contributors

diff --git a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py index c4b76132f3e..5052859e97e 100644 --- a/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py +++ b/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py @@ -5,6 +5,7 @@ from lxml import etree +from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase @@ -222,3 +223,47 @@ def test_update_source_not_a_dict(self): ) with self.assertRaisesRegex(TypeError, "Attribute `domain` is not a dict"): self.env["ir.ui.view"].apply_inheritance_specs(source, specs) + + def test_wraptext(self): + """Test textwrap transformations""" + base_view = self.env["ir.ui.view"].create( + { + "type": "qweb", + "arch": "" + "plain text 1plain text2", + } + ) + inherited_view = self.env["ir.ui.view"].create( + { + "type": "qweb", + "inherit_id": base_view.id, + "arch": "" + '' + '' + "", + } + ) + self.assertEqual( + base_view.with_context(load_all_views=True).get_combined_arch(), + "plain text 1" + "
plain text2
", + ) + translatable_arch = base_view.with_context( + load_all_views=True, edit_translations=True + )._get_combined_arch() + self.assertTrue( + translatable_arch.xpath("//some/node/span/span[@data-oe-translation-state]") + ) + self.assertTrue( + translatable_arch.xpath("//some/node/div/span[@data-oe-translation-state]") + ) + + with self.assertRaisesRegex(ValidationError, "children"): + inherited_view.write({"arch": ""}) + with self.assertRaisesRegex(ValidationError, "found"): + inherited_view.write({"arch": ''}) + with self.assertRaisesRegex(ValidationError, "positions"): + inherited_view.write( + {"arch": ''} + )