Minor fixes

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')
+            return request.redirect('/my/vps-servers')
-
-        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)
 
     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:
+            if vps_sudo.customer_id != request.env.user.partner_id:
-                return request.redirect('/my')
+                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)

ow_vm_management/views/portal_templates.xml

@@ -24,6 +24,7 @@
                         <th class='d-none d-md-table-cell'>IPv6 Address</th>
                         <th class='text-right'>CPU</th>
                         <th class='text-right'>RAM (GB)</th>
+                        <th class='text-right'>Storage (GB)</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -48,6 +49,9 @@
                             <td class='text-right'>
                                 <span t-field="server.ram"/>
                             </td>
+                            <td class='text-right'>
+                                <span t-field="server.storage"/>
+                            </td>
                         </tr>
                     </t>
                 </tbody>
@@ -73,9 +77,9 @@
                     <div class="row mb-4">
                         <div class="col-12 text-right">
                             <a t-att-href="'/my/vps/%s/restart' % vps_server.id" 
-                               class="btn btn-primary" 
+                            class="btn btn-primary" 
-                               onclick="return confirm('Are you sure you want to restart this VPS?');">
+                            onclick="return confirm('Are you sure you want to restart this VPS?');">
-                                <i class="fa fa-refresh"/> Restart VPS
+                            <i class="fa fa-refresh"/> Restart VPS
                             </a>
                         </div>
                     </div>