update domain

BT-crodriguez · Sep 15, 2023 · 14d3372 · 14d3372
1 parent d5a06bc
commit 14d3372
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/base_custom_filter/README.rst b/base_custom_filter/README.rst
@@ -48,7 +48,6 @@ Configuration
 
       * Search Field (``name``)
       * Filter Domain (``filter_domain``)
-      * Domain (``domain``)
       * User Groups (``groups``)
 
    Filter:

diff --git a/base_custom_filter/models/base.py b/base_custom_filter/models/base.py
@@ -76,8 +76,6 @@ def _add_search_field(self, res, search_fields):
             )
             if search_field.filter_domain:
                 new_field.set("filter_domain", search_field.filter_domain)
-            if search_field.domain:
-                new_field.set("domain", search_field.domain)
             xml_arch.append(new_field)
         res["arch"] = etree.tostring(xml_arch)
         return res

diff --git a/base_custom_filter/readme/CONFIGURE.rst b/base_custom_filter/readme/CONFIGURE.rst
@@ -6,7 +6,6 @@
 
       * Search Field (``name``)
       * Filter Domain (``filter_domain``)
-      * Domain (``domain``)
       * User Groups (``groups``)
 
    Filter:

diff --git a/base_custom_filter/tests/test_filters.py b/base_custom_filter/tests/test_filters.py
@@ -41,7 +41,7 @@ def test_get_view_content_search(self):
         # Test get_view() content
         view_dict = self.filters_group_obj.get_view(view_type="search")
         view_content = view_dict.get("arch", b"").decode("utf-8")
-        search_string = '<field name="display_name" filter_domain="[\'display_name\', \'ilike\', self]" domain="[]"/>'  # noqa: B950
+        search_string = "<field name=\"display_name\" filter_domain=\"['display_name', 'ilike', self]\"/>"  # noqa: B950
         self.assertIn(
             search_string, view_content, "The string is not in the returned view"
         )

diff --git a/base_custom_filter/views/ir_filters_views.xml b/base_custom_filter/views/ir_filters_views.xml
@@ -33,7 +33,7 @@
             <field name="domain" position="attributes">
                 <attribute
                     name="attrs"
-                >{'invisible': [('type', '=', 'groupby')]}</attribute>
+                >{'invisible': [('type', 'in', ['search', 'groupby'])]}</attribute>
             </field>
             <field name="domain" position="after">
                 <field