diff --git a/project_average_acceptable_time/__manifest__.py b/project_average_acceptable_time/__manifest__.py index 742efec..6a0e12f 100644 --- a/project_average_acceptable_time/__manifest__.py +++ b/project_average_acceptable_time/__manifest__.py @@ -3,7 +3,7 @@ { "name": "project_average_acceptable_time", - "version": "18.0.1.1.1", + "version": "18.0.1.1.2", "author": "Elabore", "website": "https://git.elabore.coop/elabore/project-tools", "maintainer": "Clément Thomas", diff --git a/project_average_acceptable_time/controllers/custom_portal.py b/project_average_acceptable_time/controllers/custom_portal.py index 5b69f39..5a026f1 100644 --- a/project_average_acceptable_time/controllers/custom_portal.py +++ b/project_average_acceptable_time/controllers/custom_portal.py @@ -1,6 +1,6 @@ # Copyright 2020 Lokavaluto () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo.http import request, route +from odoo.http import request from odoo.addons.portal.controllers.portal import CustomerPortal @@ -11,19 +11,14 @@ class CustomCustomerPortal(CustomerPortal): "average_acceptable_time" ] # unnecessary save in res partner, but necessary to avoid error on form post - @route(["/my/account"], type="http", auth="user", website=True) - def account(self, redirect=None, **post): - response = super().account(redirect, **post) - - if post and request.httprequest.method == "POST": - error, error_message = self.details_form_validate(post) - if not error: - # sudo: a portal user has no write access at all on - # project.project, and no read access on its default project - # unless it follows it - project_sudo = request.env.user.sudo().default_project_id - average_acceptable_time = post.get("average_acceptable_time") - if project_sudo and average_acceptable_time: - project_sudo.average_acceptable_time = average_acceptable_time - - return response + def on_account_update(self, values, partner): + res = super().on_account_update(values, partner) + average_acceptable_time = values.get("average_acceptable_time") + if average_acceptable_time: + # sudo: a portal user has no write access at all on + # project.project, and no read access on its default project + # unless it follows it + project_sudo = request.env.user.sudo().default_project_id + if project_sudo: + project_sudo.average_acceptable_time = average_acceptable_time + return res diff --git a/project_average_acceptable_time/tests/test_portal_account.py b/project_average_acceptable_time/tests/test_portal_account.py index 7084b1e..3a3a813 100644 --- a/project_average_acceptable_time/tests/test_portal_account.py +++ b/project_average_acceptable_time/tests/test_portal_account.py @@ -52,3 +52,25 @@ class TestPortalAccountAverageAcceptableTime(HttpCase): self.assertEqual(response.status_code, 200) self.project.invalidate_recordset() self.assertEqual(self.project.average_acceptable_time, 1.5) + + def test_account_post_when_country_cannot_be_edited(self): + """The form must save when the country select is disabled. + + A contact with a parent cannot edit its VAT, so the country select + is disabled and is not submitted with the form. Odoo core injects + the missing ``country_id`` in its own copy of the posted data, so + the controller must not validate the raw payload a second time. + """ + company = self.env["res.partner"].create( + {"name": "Portal company", "is_company": True} + ) + self.portal_user.partner_id.write( + {"parent_id": company.id, "country_id": self.env.ref("base.fr").id} + ) + self.authenticate(self.portal_user.login, self.portal_user.login) + data = self._account_form_data(average_acceptable_time="2.0") + data.pop("country_id") + response = self.url_open("/my/account", data=data) + self.assertEqual(response.status_code, 200) + self.project.invalidate_recordset() + self.assertEqual(self.project.average_acceptable_time, 2.0)