From 375c9f8a8ecd78eb4bcfa62e778fefd777eb1d04 Mon Sep 17 00:00:00 2001 From: valen Date: Wed, 15 Jan 2025 12:35:41 +0100 Subject: [PATCH] [FIX] report_qweb_parameter: out and raw doesn't work with conditionals --- report_qweb_parameter/README.rst | 12 ++++++++---- .../demo/test_report_field_length.xml | 19 +++++++++++++++++-- report_qweb_parameter/models/ir_qweb.py | 4 ++-- report_qweb_parameter/readme/CONTRIBUTORS.md | 4 ++++ .../static/description/index.html | 7 +++++++ .../tests/test_report_qweb_parameter.py | 13 +++++++++++-- 6 files changed, 49 insertions(+), 10 deletions(-) diff --git a/report_qweb_parameter/README.rst b/report_qweb_parameter/README.rst index d6b00838b..c8277605e 100644 --- a/report_qweb_parameter/README.rst +++ b/report_qweb_parameter/README.rst @@ -72,13 +72,17 @@ Authors Contributors ------------ -- Enric Tobella +- Enric Tobella -- `Tecnativa `__: +- `Tecnativa `__: - - Carlos Roca + - Carlos Roca -- Iván Antón +- Iván Antón + +- `Sygel Technology `__: + + - Valentin Vinagre Maintainers ----------- diff --git a/report_qweb_parameter/demo/test_report_field_length.xml b/report_qweb_parameter/demo/test_report_field_length.xml index 774f426cc..29135c297 100644 --- a/report_qweb_parameter/demo/test_report_field_length.xml +++ b/report_qweb_parameter/demo/test_report_field_length.xml @@ -15,6 +15,11 @@ t-esc="docs[0].street" t-if="docs[0].street" /> +
  • +
  • +
  • - Carlos Roca - Iván Antón \<\> + +- [Sygel Technology](https://www.sygel.es): + + > - Valentin Vinagre diff --git a/report_qweb_parameter/static/description/index.html b/report_qweb_parameter/static/description/index.html index f9b095124..50b285b11 100644 --- a/report_qweb_parameter/static/description/index.html +++ b/report_qweb_parameter/static/description/index.html @@ -431,6 +431,13 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

  • Iván Antón <ozono@ozonomultimedia.com>

    • +

  • Sygel Technology:

    +
    +
      +
    • Valentin Vinagre
      • +
    +
    +
    • diff --git a/report_qweb_parameter/tests/test_report_qweb_parameter.py b/report_qweb_parameter/tests/test_report_qweb_parameter.py index 19dd76c8a..746825200 100644 --- a/report_qweb_parameter/tests/test_report_qweb_parameter.py +++ b/report_qweb_parameter/tests/test_report_qweb_parameter.py @@ -24,9 +24,18 @@ class TestReportQWebParameter(common.TransactionCase): docs.website = "1234567890" # for avoding that Odoo adds http:// rep = report_object._render(report_name, docs.ids, False) root = ET.fromstring(rep[0]) + + # test length self.assertEqual(root[0].text, "1234567890") - self.assertEqual(root[2].text, "1234567890") - self.assertEqual(root[4].text, "1234567890") + self.assertEqual(root[3].text, "1234567890") + self.assertEqual(root[6].text, "1234567890") + + # test condicional length + self.assertEqual(root[1].text, "Tes") + self.assertEqual(root[4].text, "Test") + self.assertEqual(root[7].text, "Test ") + + # test maxlength docs.update({"street": "123456789"}) with self.assertRaises(QWebException): report_object._render(report_name, docs.ids, False)