From 3a3d211cd3ab68cb235840e2c36dbee5e48838c1 Mon Sep 17 00:00:00 2001
From: Jonathan Carter <jcc@debian.org>
Date: Tue, 10 Mar 2026 15:43:14 +0200
Subject: [PATCH] Commit previous changes

---
 .../disks/__pycache__/routes.cpython-313.pyc  | Bin 6320 -> 7463 bytes
 src/yasi_applets/disks/disks_erase_menu.html  |   2 +-
 src/yasi_applets/disks/routes.py              |  28 ++++++++++++++++++
 src/yasi_applets/welcome/welcome.html         |   2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc b/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc
index 3a33872b54621449ba81d4bc65235a2b0eee78b5..f3625ee422502ccf25a2f9989a8f4c3a1ba1125f 100644
GIT binary patch
delta 1032
zcmY*YOH30{6rDHyOn*~4v;#x2Fy$i*Kf_PtBSNAgO3*Mdl1S2&c7O&t)z_kl8;FSu
zm*lx}BRfq@jHZbu?saLXEFg{UShy2{3!{ng-YF&Uk~zKa-gD18?@s4!_sb#wp(uJd
zSU;rKsX1lCuaJ-LTJDqSIWltw^QTt>r%U~$l+!E2T>nv-%6c%&(JDOzSUp$Oa9mNj
zMVlt)-;;ts&ayG5(i}@HWwM5OZX}t?E{`UT)GQ${pbehGFKnFe=S{+XhMEPt15&z!
zZ8~czoaNI^ezsvoVBK=CMkwcWS0^x$ZQ9D!=yBCjaShFKTpZ5O-KPC!RhcCpvp@sp
zVQJXeEkP3<cSR7imhL&>$IGI!cEX#&UU=P8_SybfqWcD2O`Ik^8una<JF2A%cc|H=
z%tLkFSjbRAjhjg|zK}DhnpseB5^5r2E~FM$X*`$8m|Y%P!5)Zp?2@l`EsXVS%%JhC
z5wmDCZ6v#va_JQ+gELLAey9X7twvA~Y5<BZ>^0+Qqv*L8r@0i0XK5HpnzLxfBJDsj
z>d+`c0|NGDodBw;-hqcULR_pb8G-x28;s%Rv?<yJtU+x34Y1Dr@^O`s9jUP(HEv!j
zNS&{i3ev#Vg&PHFYW?~id*fdYeGAAtf!42q*6l#s`sAKByj45E+T9a@_L1G@p53O_
z1Ig`+>~rq?n){E<Lp2blZ2;_<I4qRB_ptBc6SWu56#&34F3U0vA|K&){;_|akM!Z*
zjo?G51<?4S9cM!a8IhunVMygzi}W`_@$Y1fLbK62jO!7s?u%@!vfeQY`*oJA{2(G#
zBc<9HYYj#n<B)mErh|Kq35YiG1EJ4^XzZUnS$72z^eRF#0?wA=r)0r%W>mc)3JX<d
zCUBmmE1)Zi$5GU!C|PPbEmL%jq%+CY6=Rg@K*5hI%M<pgIwALLlimYfA(2BH$M@}H
Lw11w}D;xg-Y}MMf

delta 363
zcmZ2(wZV|@GcPX}0}zyHcV})8p2#P`*tJo;kWnsJP>P{QG*}2oip7X3F_?lB0f7QT
zI<uzm=4Xr-**AaT{lq+(i${9$2SIDTTU-T+MJ1UfnfZCeMY@xXgjyN(C+`rFW3=3S
zT_}l((O|Nbs5GPL<S<c1R&$_15tC~~e>>e`Ny#kEE|LTaXfhYc0jVN+5Wxu|EP+HZ
z6Od3)C{hMew|GH{i{n#LOA<44ii@m)Vkwh%h;8S!0<tt2A-ZfQ*N7{!+5ts!Cod9z
z!s-HKm2U2qIL64RH91JiQ_cw}P~;3ER6zvD<RU{DQ8#&~)H+7-$r;l5PQoBTkXykv
r6@iQ_0+|L;jcURz4x8Nkl+v73yP^P~5=I~{e!?(WP9}Nse3=daD05V5

diff --git a/src/yasi_applets/disks/disks_erase_menu.html b/src/yasi_applets/disks/disks_erase_menu.html
index 27b50b5..d1ca7e6 100644
--- a/src/yasi_applets/disks/disks_erase_menu.html
+++ b/src/yasi_applets/disks/disks_erase_menu.html
@@ -10,7 +10,7 @@
 <p> <span style="width: 100%; border-radius: 8px 8px 0 0;" class="tag is-black">
         <b>{{ disk['name'] }}: &nbsp; </b>  {{ disk['model'] }} - {{ disk['tran'] }} disk ({{(disk['size']/1024000000)|round(0)|int }} GB) - Serial: {{ disk['serial'] }} </p>
     <center style="padding: 5px; padding-bottom: 5px;">
-     <td><a hx-get="/disks/choose_disk_erase_disk/{{ disk['name'] }}" hx-swap="outerHTML"><span class="tag is-link"> Select Disk  </span></a></td>
+     <td><a href="/disks/choose_disk_erase_chosen/{{ disk['name'] }}"><span class="tag is-link"> Select Disk  </span></a></td>
     </center>
 
   {% if disk['maj:min'] == "252:0" %}
diff --git a/src/yasi_applets/disks/routes.py b/src/yasi_applets/disks/routes.py
index 3260693..c860fd7 100644
--- a/src/yasi_applets/disks/routes.py
+++ b/src/yasi_applets/disks/routes.py
@@ -54,6 +54,34 @@ def disks_choose_disk_erase():
                            )
 
 
+@bp.route('/disks/choose_disk_erase_chosen/<disk>')
+def disks_choose_disk_erase_confirm(disk):
+    """
+    Disk chosen, show before and after of disk configuration.
+    """
+
+    partitions = current_app.config['CONFIG']['recipe']['create_partitions']
+
+    menu = current_app.config['CONFIG']['settings']['menu_order'].split(" ")
+    next_step_url = menu[menu.index("disks")+1]
+    if menu[menu.index("disks")] == 1:
+        previous_step_url = False
+    else:
+        previous_step_url = menu[menu.index("disks")-1]
+    blockdevs = lsblk.list_block_devices()
+
+    return render_template('disks_erase_confirmed.html',
+                           menu=current_app.config['CONFIG']
+                                                  ['settings']['menu'],
+                           menu_order=current_app.config['CONFIG']
+                                                        ['settings']
+                                                        ['menu_order'].split(),
+                           previous_step = previous_step_url,
+                           next_step=next_step_url, blockdevs=blockdevs,
+                           diskname=disk, partitions=partitions
+                           )
+
+
 @bp.route('/disks/advanced')
 def disks():
     """
diff --git a/src/yasi_applets/welcome/welcome.html b/src/yasi_applets/welcome/welcome.html
index abfb29a..de96a54 100644
--- a/src/yasi_applets/welcome/welcome.html
+++ b/src/yasi_applets/welcome/welcome.html
@@ -12,8 +12,8 @@
 <div hx-get="/software" hx-target="#none" hx-trigger="load"></div>
 <div hx-get="/summary" hx-target="#none" hx-trigger="load"></div>
 <!-- TODO: Add hook to fix next tab again after loading summary -->
-<div style="display: none;" id="none"></div>
 
+<div style="display: none;" id="none"></div>
 
 <p><b> {{ string_dict['welcome_text'] }} </b></p>
 <p>{{ string_dict['confirm_text'] }} </p> <br />