From e0bad00f0df06aff7c4802485aebf503874b42f3 Mon Sep 17 00:00:00 2001
From: Mario <mario@MacBook-Pro-van-Mario.local>
Date: Mon, 5 Aug 2024 23:45:20 +0200
Subject: [PATCH] Minor fixes

---
 .../__pycache__/portal.cpython-39.pyc         | Bin 3639 -> 3629 bytes
 ow_vm_management/controllers/portal.py        |  20 ++++++++----------
 .../__pycache__/vps_server.cpython-39.pyc     | Bin 7570 -> 7570 bytes
 ow_vm_management/views/portal_templates.xml   |  10 ++++++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ow_vm_management/controllers/__pycache__/portal.cpython-39.pyc b/ow_vm_management/controllers/__pycache__/portal.cpython-39.pyc
index b17e14a7a71db759563f00d523656ff5d920aa4f..daf42c15ac4e0a798050a6566a169ed1c2c47461 100644
GIT binary patch
delta 497
zcma)%O-lkn7{}+CUELRVWfL+XF}fs1V&9<1Ea~+SlwDe6cO_RgV|Fu?6_4Gz40MUW
zg$`YUq=U!Kb?fT6Z_pQL2J-F<{CJo@^E}UQoPEvebzN5xJ1><{<9npnq(L=ALu5k;
z5$+42;6i|1!4=(DOCYNO9>#4P!5KP1A#$ZqXh0K%_!;h@FS1m&g;0zz&qWj{T^kU;
z(|>Vv&XRRxGZw@n!e^5lLoeUHH9MZ^(I07fQJthsyKUWg&Q)MqmyXpk>z3vCKGEo#
zx}Z*E;@C~%SOMLa^O%UVE!UD77@$E4l8n6^RiqsKl|Nz?*8Z4|m0)1=L0dEX2}3EG
z?k<Gzh@Sq<nVH<ZnAOZEdEHXy+Aq%e4(T|=FBKG0=Hgr?1KaddUCI!Vy%a<;&x0L~
zO^#h^Bv#U=tn>{AgfWxjnlhx`4-y%GJ?dy{G2X9EAGAB8$|}O0$stFX7WEBKsi%Ma
E0ef$7;s5{u

delta 504
zcmYk2$w~u35Qcl1NhY(%C^32ns0hY^xV(W|+)xw=l8A>GGKpkNRN7XFjO6G=y!2Vf
zfJepc;5!K7Jtq%7gm|(#3)oHn{Zmy<^;Zw^x44zJEFHnR|9LFkK3myv-S$xfx!A`6
zxuh9%7*`O-wIoJzbJCzL32+GQpfs9BKJ^q&<-`klVNdha1IpIBHEHA{FXGb@E+e1Z
z;TwFZKu&k5uLLBG9A$&a-oJFJTDwRbo#)P~xvKaMk5Ho-6HjJrf+>(^Do9gfMYqg~
z1<p(vi%PMj^h)Ui5p!BXRJCox#wNB&6zil<d}v?l5+t|8ON7@;;4V`C0RaGegtssN
zf&joIr;V_L%mAWK8(JX2AqGAYpmrRFqSy91L+R9ahvLFJhqmF^0<?4tmV%3g+FuvL
z+5lmT;!__QZ}#jLdG7d#@q8tB$|@~lM`8W4ep$+_lob&&#$s8pClVSF0*p~O8n$2O
jjX{jp#IBiCWt)PyHm~eea7>c3O(`icYRzC%6s-3@3>0j2

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 2859304e2031100688314ea4aaefb3ef32a1dc88..d263377f9ecd324ee8ab2098b0408d5eedbe7ee5 100644
GIT binary patch
delta 20
acmbPaJ;|Cok(ZZ?0SFA3Hf-c>mjwVX9t3Rw

delta 20
acmbPaJ;|Cok(ZZ?0SM;(TECIIT^0a0>jlyP

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 @@
                         <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" 
-                               onclick="return confirm('Are you sure you want to restart this VPS?');">
-                                <i class="fa fa-refresh"/> Restart VPS
+                            class="btn btn-primary" 
+                            onclick="return confirm('Are you sure you want to restart this VPS?');">
+                            <i class="fa fa-refresh"/> Restart VPS
                             </a>
                         </div>
                     </div>