Skip to content

Commit 062d11a

Browse files
committed
[FIX] adapt code and test to renaming of <tree> to <list> in Odoo 18
See odoo/odoo#159909 closes #134 Related: odoo/upgrade#6484 Signed-off-by: Christophe Simonis (chs) <[email protected]>
1 parent b7fbb07 commit 062d11a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/base/tests/test_util.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,17 +310,18 @@ def test_any_operator(self):
310310

311311
class TestAdaptDomainView(UnitTestCase):
312312
def test_adapt_domain_view(self):
313+
tag = "list" if util.version_gte("saas~17.5") else "tree"
313314
view_form = self.env["ir.ui.view"].create(
314315
{
315316
"name": "test_adapt_domain_view_form",
316317
"model": "res.currency",
317-
"arch": """\
318+
"arch": f"""\
318319
<form>
319320
<field name="rate_ids">
320-
<tree>
321+
<{tag}>
321322
<field name="company_id" domain="[('email', '!=', False)]"/>
322323
<field name="company_id" domain="[('email', 'not like', 'odoo.com')]"/>
323-
</tree>
324+
</{tag}>
324325
</field>
325326
</form>
326327
""",

src/util/records.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,7 @@ def ensure_mail_alias_mapping(cr, model, record_xmlid, alias_xmlid, alias_name):
15991599

16001600

16011601
def remove_act_window_view_mode(cr, model, view_mode):
1602+
default = "list,form" if version_gte("saas~17.5") else "tree,form"
16021603
cr.execute(
16031604
"""
16041605
WITH upd AS (
@@ -1608,7 +1609,7 @@ def remove_act_window_view_mode(cr, model, view_mode):
16081609
ARRAY_TO_STRING(ARRAY_REMOVE(STRING_TO_ARRAY(view_mode, ','), %s), ','),
16091610
'' -- invalid value
16101611
),
1611-
'tree,form' -- default value
1612+
%s -- default value
16121613
)
16131614
WHERE act.res_model = %s
16141615
AND %s = ANY(STRING_TO_ARRAY(act.view_mode, ','))
@@ -1620,5 +1621,5 @@ def remove_act_window_view_mode(cr, model, view_mode):
16201621
WHERE upd.id = av.act_window_id
16211622
AND av.view_mode=%s
16221623
""",
1623-
[view_mode, model, view_mode, view_mode],
1624+
[view_mode, default, model, view_mode, view_mode],
16241625
)

0 commit comments

Comments
 (0)