From 1d71e35cde4a0474569371e3fec3734323a71d34 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Wed, 30 Aug 2023 15:45:56 +0200 Subject: [PATCH] [REF] web: remove old web_search_read as it will be replaced by unity_web_search_read Part-of: odoo/odoo#133617 --- addons/web/models/models.py | 22 +--------------------- addons/web/tests/test_web_search_read.py | 23 ----------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/addons/web/models/models.py b/addons/web/models/models.py index 141a2962286..ddc4def139b 100644 --- a/addons/web/models/models.py +++ b/addons/web/models/models.py @@ -41,24 +41,6 @@ DISPLAY_DATE_FORMATS = { class Base(models.AbstractModel): _inherit = 'base' - @api.model - def web_search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, count_limit=None): - """ - Performs a search_read and a search_count. - - :param domain: search domain - :param fields: list of fields to read - :param limit: maximum number of records to read - :param offset: number of records to skip - :param order: columns to sort results - :return: { - 'records': array of read records (result of a call to 'search_read') - 'length': number of records matching the domain (result of a call to 'search_count') - } - """ - values_records = self.search_read(domain, fields, offset=offset, limit=limit, order=order) - return self._format_web_search_read_results(domain, values_records, offset, limit, count_limit) - @api.model def unity_web_search_read(self, domain, specification, offset=0, limit=None, order=None, count_limit=None): records = self.search_fetch(domain, specification.keys(), offset=offset, limit=limit, order=order) @@ -227,8 +209,7 @@ class Base(models.AbstractModel): @api.model def web_read_group(self, domain, fields, groupby, limit=None, offset=0, orderby=False, lazy=True): """ - Returns the result of a read_group (and optionally search for and read records inside each - group), and the total number of groups matching the search domain. + Returns the result of a read_group and the total number of groups matching the search domain. :param domain: search domain :param fields: list of fields to read (see ``fields``` param of ``read_group``) @@ -263,7 +244,6 @@ class Base(models.AbstractModel): @api.model def _web_read_group(self, domain, fields, groupby, limit=None, offset=0, orderby=False, lazy=True): """ - Performs a read_group and optionally a web_search_read for each group. See ``web_read_group`` for params description. :returns: array of groups diff --git a/addons/web/tests/test_web_search_read.py b/addons/web/tests/test_web_search_read.py index 0fa4fd91d1e..ebe69afe917 100644 --- a/addons/web/tests/test_web_search_read.py +++ b/addons/web/tests/test_web_search_read.py @@ -12,29 +12,6 @@ class TestWebSearchRead(common.TransactionCase): cls.ResCurrency = cls.env['res.currency'].with_context(active_test=False) cls.max = cls.ResCurrency.search_count([]) - def assert_web_search_read(self, expected_length, expected_records_length, expected_search_count_called=True, **kwargs): - original_search_count = self.ResCurrency.search_count - search_count_called = [False] - - def search_count(obj, *method_args, **method_kwargs): - search_count_called[0] = True - return original_search_count(*method_args, **method_kwargs) - - with patch('odoo.addons.base.models.res_currency.Currency.search_count', new=search_count): - results = self.ResCurrency.web_search_read(domain=[], fields=['id'], **kwargs) - - self.assertEqual(results['length'], expected_length) - self.assertEqual(len(results['records']), expected_records_length) - self.assertEqual(search_count_called[0], expected_search_count_called) - - def test_web_search_read(self): - self.assert_web_search_read(self.max, self.max, expected_search_count_called=False) - self.assert_web_search_read(self.max, 2, limit=2) - self.assert_web_search_read(self.max, 2, limit=2, offset=10) - self.assert_web_search_read(2, 2, limit=2, count_limit=2, expected_search_count_called=False) - self.assert_web_search_read(20, 2, limit=2, offset=10, count_limit=20) - self.assert_web_search_read(12, 2, limit=2, offset=10, count_limit=12, expected_search_count_called=False) - def assert_unity_web_search_read(self, expected_length, expected_records_length, expected_search_count_called=True, **kwargs): original_search_count = self.ResCurrency.search_count