From 71f3fa991c69af265cb1737eae2b78f20541f0e5 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Tue, 30 Jun 2020 17:20:19 +0000 Subject: [PATCH] [IMP] *: disable unused archive_groups feature in portal The archive groups feature allows the user to have fast access to records of a given month, under its details information. But since the details section isn't shown anymore on portal sub-pages, the feature is computed for nothing on (most) pages. Removing this computation avoids a read_group call on portal subpages (multiple potential queries). This commit disables the feature until a total removal in master. my_details is only truthy on the /my/account portal page, where no archive_groups is given anyway (and the value is set to True only in the rendered tempate itself). X-original-commit: 40c57fafdd5651a522891ab68affe38933ea5202 --- addons/account/controllers/portal.py | 2 +- addons/project/controllers/portal.py | 4 ++-- addons/purchase/controllers/portal.py | 2 +- addons/sale/controllers/portal.py | 4 ++-- addons/website_crm_partner_assign/controllers/main.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/account/controllers/portal.py b/addons/account/controllers/portal.py index 3818a9d4d6b..6177008ca69 100644 --- a/addons/account/controllers/portal.py +++ b/addons/account/controllers/portal.py @@ -57,7 +57,7 @@ class PortalAccount(CustomerPortal): filterby = 'all' domain += searchbar_filters[filterby]['domain'] - archive_groups = self._get_archive_groups('account.move', domain) + archive_groups = self._get_archive_groups('account.move', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py index 9d6f591d65d..eef58fab633 100644 --- a/addons/project/controllers/portal.py +++ b/addons/project/controllers/portal.py @@ -46,7 +46,7 @@ class CustomerPortal(CustomerPortal): order = searchbar_sortings[sortby]['order'] # archive groups - Default Group By 'create_date' - archive_groups = self._get_archive_groups('project.project', domain) + archive_groups = self._get_archive_groups('project.project', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] # projects count @@ -158,7 +158,7 @@ class CustomerPortal(CustomerPortal): groupby = 'project' # archive groups - Default Group By 'create_date' - archive_groups = self._get_archive_groups('project.task', domain) + archive_groups = self._get_archive_groups('project.task', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] diff --git a/addons/purchase/controllers/portal.py b/addons/purchase/controllers/portal.py index 252b7d0153d..c566963c32c 100644 --- a/addons/purchase/controllers/portal.py +++ b/addons/purchase/controllers/portal.py @@ -44,7 +44,7 @@ class CustomerPortal(CustomerPortal): domain = [] - archive_groups = self._get_archive_groups('purchase.order', domain) + archive_groups = self._get_archive_groups('purchase.order', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] diff --git a/addons/sale/controllers/portal.py b/addons/sale/controllers/portal.py index 64fc442916a..6267683fba7 100644 --- a/addons/sale/controllers/portal.py +++ b/addons/sale/controllers/portal.py @@ -60,7 +60,7 @@ class CustomerPortal(CustomerPortal): sortby = 'date' sort_order = searchbar_sortings[sortby]['order'] - archive_groups = self._get_archive_groups('sale.order', domain) + archive_groups = self._get_archive_groups('sale.order', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] @@ -111,7 +111,7 @@ class CustomerPortal(CustomerPortal): sortby = 'date' sort_order = searchbar_sortings[sortby]['order'] - archive_groups = self._get_archive_groups('sale.order', domain) + archive_groups = self._get_archive_groups('sale.order', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index 714f3e9ea93..314257fe69d 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -60,7 +60,7 @@ class WebsiteAccount(CustomerPortal): order = searchbar_sortings[sortby]['order'] # archive groups - Default Group By 'create_date' - archive_groups = self._get_archive_groups('crm.lead', domain) + archive_groups = self._get_archive_groups('crm.lead', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] # pager @@ -126,7 +126,7 @@ class WebsiteAccount(CustomerPortal): CrmLead = CrmLead.with_context(active_test=False) # archive groups - Default Group By 'create_date' - archive_groups = self._get_archive_groups('crm.lead', domain) + archive_groups = self._get_archive_groups('crm.lead', domain) if values.get('my_details') else [] if date_begin and date_end: domain += [('create_date', '>', date_begin), ('create_date', '<=', date_end)] # pager