diff --git a/ow_vm_management/controllers/__pycache__/portal.cpython-39.pyc b/ow_vm_management/controllers/__pycache__/portal.cpython-39.pyc index b17e14a..daf42c1 100644 Binary files a/ow_vm_management/controllers/__pycache__/portal.cpython-39.pyc and b/ow_vm_management/controllers/__pycache__/portal.cpython-39.pyc differ diff --git a/ow_vm_management/controllers/portal.py b/ow_vm_management/controllers/portal.py index e477ab1..3ccf2c6 100644 --- a/ow_vm_management/controllers/portal.py +++ b/ow_vm_management/controllers/portal.py @@ -69,14 +69,12 @@ class VPSPortal(CustomerPortal): def portal_my_vps_server(self, vps_id, **kw): try: vps_sudo = self._document_check_access('vps.server', vps_id) + if vps_sudo.customer_id != request.env.user.partner_id: + return request.redirect('/my/vps-servers') + values = self._vps_server_get_page_view_values(vps_sudo, **kw) + return request.render("ow_vm_management.portal_vps_server_page", values) except AccessError: - return request.redirect('/my') - - if vps_sudo.customer_id.id != request.env.user.partner_id.id: - return request.redirect('/my') - - values = self._vps_server_get_page_view_values(vps_sudo, **kw) - return request.render("ow_vm_management.portal_vps_server_page", values) + return request.redirect('/my/vps-servers') def _vps_server_get_page_view_values(self, vps_server, access_token=None, **kwargs): values = { @@ -89,12 +87,12 @@ class VPSPortal(CustomerPortal): def portal_restart_vps(self, vps_id, **kw): try: vps_sudo = self._document_check_access('vps.server', vps_id) - if vps_sudo.customer_id.id != request.env.user.partner_id.id: - return request.redirect('/my') + if vps_sudo.customer_id != request.env.user.partner_id: + return request.redirect('/my/vps-servers') vps_sudo.action_restart_from_portal() - return request.redirect(vps_sudo.get_portal_url()) + return request.redirect(f'/my/vps-servers/{vps_id}') except AccessError: - return request.redirect('/my') + return request.redirect('/my/vps-servers') def _document_check_access(self, model_name, document_id, access_token=None): document = request.env[model_name].sudo().browse(document_id) diff --git a/ow_vm_management/models/__pycache__/vps_server.cpython-39.pyc b/ow_vm_management/models/__pycache__/vps_server.cpython-39.pyc index 2859304..d263377 100644 Binary files a/ow_vm_management/models/__pycache__/vps_server.cpython-39.pyc and b/ow_vm_management/models/__pycache__/vps_server.cpython-39.pyc differ diff --git a/ow_vm_management/views/portal_templates.xml b/ow_vm_management/views/portal_templates.xml index ac7485b..3d351d6 100644 --- a/ow_vm_management/views/portal_templates.xml +++ b/ow_vm_management/views/portal_templates.xml @@ -24,6 +24,7 @@