[FIX] util.adapt_domains

Also adapt domains in views

Part-of: odoo/upgrade#5120
Co-authored-by: Alvaro Fuentes Suarez <[email protected]>

Author: KangOl

src/base/tests/test_util.py

@@ -235,6 +235,64 @@ def test_force_adapt(self, left, model, target_model="res.users", old="partner_i
         self.assertEqual(res, self.mock_adapter.return_value)
 
 
+class TestAdaptDomainView(UnitTestCase):
+    def test_adapt_domain_view(self):
+        view_form = self.env["ir.ui.view"].create(
+            {
+                "name": "test_adapt_domain_view_form",
+                "model": "res.currency",
+                "arch": """\
+                <form>
+                  <field name="rate_ids">
+                    <tree>
+                      <field name="company_id" domain="[('email', '!=', False)]"/>
+                      <field name="company_id" domain="[('email', 'not like', 'odoo.com')]"/>
+                    </tree>
+                  </field>
+                </form>
+            """,
+            }
+        )
+
+        view_search_1 = self.env["ir.ui.view"].create(
+            {
+                "name": "test_adapt_domain_view_search",
+                "model": "res.company",
+                "arch": """\
+                <search>
+                  <field name="email" string="Mail" filter_domain="[('email', '=', self)]"/>
+                </search>
+            """,
+            }
+        )
+
+        view_search_2 = self.env["ir.ui.view"].create(
+            {
+                "name": "test_adapt_domain_view_search",
+                "model": "res.company",
+                "arch": """\
+                <search>
+                  <filter name="mail" string="Mail" domain="[('email', '=', self)]"/>
+                </search>
+            """,
+            }
+        )
+
+        util.adapt_domains(self.env.cr, "res.partner", "email", "courriel")
+        util.invalidate(view_form | view_search_1 | view_search_2)
+
+        self.assertIn("email", view_form.arch)
+        self.assertIn("email", view_search_1.arch)
+        self.assertIn("email", view_search_2.arch)
+
+        util.adapt_domains(self.env.cr, "res.company", "email", "courriel")
+        util.invalidate(view_form | view_search_1 | view_search_2)
+
+        self.assertIn("courriel", view_form.arch)
+        self.assertIn("courriel", view_search_1.arch)
+        self.assertIn("courriel", view_search_2.arch)
+
+
 class TestRemoveFieldDomains(UnitTestCase):
     @parametrize(
         [

src/util/domains.py

@@ -22,7 +22,8 @@
 from .helpers import _dashboard_actions, _validate_model
 from .inherit import for_each_inherit
 from .misc import SelfPrintEvalContext
-from .pg import column_exists, table_exists
+from .pg import column_exists, get_value_or_en_translation, table_exists
+from .records import edit_view
 
 # python3 shims
 try:
@@ -133,10 +134,8 @@ def _get_domain_fields(cr):
             yield df
 
 
-def _valid_path_to(cr, path, from_, to):
-    model = from_
-    while path:
-        field = path.pop(0)
+def _model_of_path(cr, model, path):
+    for field in path:
         cr.execute(
             """
             SELECT relation
@@ -147,11 +146,15 @@ def _valid_path_to(cr, path, from_, to):
             [model, field],
         )
         if not cr.rowcount:
-            # unknown field. Maybe an old domain. Cannot validate it.
-            return False
+            return None
         [model] = cr.fetchone()
 
-    return model == to
+    return model
+
+
+def _valid_path_to(cr, path, from_, to):
+    model = _model_of_path(cr, from_, path)
+    return model is not None and model == to
 
 
 def _adapt_one_domain(cr, target_model, old, new, model, domain, adapter=None, force_adapt=False):
@@ -258,7 +261,7 @@ def adapt_domains(cr, model, old, new, adapter=None, skip_inherit=(), force_adap
     it is part of an and ("&") domain. The other parameter signals if the leaf is
     {negated} ("!").
 
-    Note that the {adapter} is called ony on leafs that use the {old} field of {model}.
+    Note that the {adapter} is called only on leafs that use the {old} field of {model}.
 
     {force_adapt} will run the adapter on all leaves having the removed field in the path. Useful
     when deleting a field (in which case {new} is ignored).
@@ -288,6 +291,41 @@ def adapt_domains(cr, model, old, new, adapter=None, skip_inherit=(), force_adap
                     [unicode(new_domain), id_],
                 )
 
+    # adapt search views
+    arch_db = get_value_or_en_translation(cr, "ir_ui_view", "arch_db")
+    cr.execute("SELECT id, model FROM ir_ui_view WHERE {} ~ %s".format(arch_db), [match_old])
+    for view_id, view_model in cr.fetchall():
+        with edit_view(cr, view_id=view_id) as view:
+            for node in view.xpath(
+                "//filter[contains(@domain, '{0}')]|//field[contains(@filter_domain, '{0}')]".format(old)
+            ):
+                attr = "domain" if "domain" in node.attrib else "filter_domain"
+                domain = _adapt_one_domain(
+                    cr, target_model, old, new, view_model, node.get(attr), adapter=adapter, force_adapt=force_adapt
+                )
+                if domain:
+                    node.set(attr, unicode(domain))
+
+            for node in view.xpath("//field[contains(@domain, '{0}')]".format(old)):
+                # as <fields> can happen in sub-views, we should deternine the actual model the field belongs to
+                path = list(reversed([p.get("name") for p in node.iterancestors("field")])) + [node.get("name")]
+                field_model = _model_of_path(cr, view_model, path)
+                if not field_model:
+                    continue
+
+                domain = _adapt_one_domain(
+                    cr,
+                    target_model,
+                    old,
+                    new,
+                    field_model,
+                    node.get("domain"),
+                    adapter=adapter,
+                    force_adapt=force_adapt,
+                )
+                if domain:
+                    node.set("domain", unicode(domain))
+
     # adapt domain in dashboards.
     # NOTE: does not filter on model at dashboard selection for handle dotted domains
     for _, act in _dashboard_actions(cr, match_old):