From 9cfb6c05a46ced5d58dfd4801c143ebf53d6d6ef Mon Sep 17 00:00:00 2001 From: laa Date: Tue, 19 Nov 2019 14:58:06 +0000 Subject: [PATCH] [FIX] Portal : missing url args on the portal: - in Timesheets, when search something, the text of the search must remain displayed - in Tasks, when search something, the text of the search must remain displayed - in Purchase Orders, "Sort By" and "Filter By" selectors shouldn't change when going to next page - in Timesheets, the "Group By" selector shouldn't change when going to next page closes odoo/odoo#40278 Related: odoo/enterprise#6787 Signed-off-by: Yannick Tivisse (yti) --- addons/hr_timesheet/controllers/portal.py | 3 ++- addons/project/controllers/portal.py | 1 + addons/purchase/controllers/portal.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/hr_timesheet/controllers/portal.py b/addons/hr_timesheet/controllers/portal.py index 9fd6ac942fc..95646b94dcd 100644 --- a/addons/hr_timesheet/controllers/portal.py +++ b/addons/hr_timesheet/controllers/portal.py @@ -74,7 +74,7 @@ class TimesheetCustomerPortal(CustomerPortal): # pager pager = portal_pager( url="/my/timesheets", - url_args={'sortby': sortby, 'search_in': search_in, 'search': search, 'filterby': filterby}, + url_args={'sortby': sortby, 'search_in': search_in, 'search': search, 'filterby': filterby, 'groupby': groupby}, total=timesheet_count, page=page, step=self._items_per_page @@ -96,6 +96,7 @@ class TimesheetCustomerPortal(CustomerPortal): 'pager': pager, 'searchbar_sortings': searchbar_sortings, 'search_in': search_in, + 'search': search, 'sortby': sortby, 'groupby': groupby, 'searchbar_inputs': searchbar_inputs, diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py index e4d36b713e2..200e151cc80 100644 --- a/addons/project/controllers/portal.py +++ b/addons/project/controllers/portal.py @@ -215,6 +215,7 @@ class CustomerPortal(CustomerPortal): 'searchbar_groupby': searchbar_groupby, 'searchbar_inputs': searchbar_inputs, 'search_in': search_in, + 'search': search, 'sortby': sortby, 'groupby': groupby, 'searchbar_filters': OrderedDict(sorted(searchbar_filters.items())), diff --git a/addons/purchase/controllers/portal.py b/addons/purchase/controllers/portal.py index 171373bbec5..bccc25331d0 100644 --- a/addons/purchase/controllers/portal.py +++ b/addons/purchase/controllers/portal.py @@ -74,7 +74,7 @@ class CustomerPortal(CustomerPortal): # make pager pager = portal_pager( url="/my/purchase", - url_args={'date_begin': date_begin, 'date_end': date_end}, + url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'filterby': filterby}, total=purchase_count, page=page, step=self._items_per_page