From aeb880ed0ac3dda45cc004f527a7541d840648ce Mon Sep 17 00:00:00 2001
From: Peter Stockings <pstockings@jadeworld.com>
Date: Sun, 16 Feb 2025 20:22:03 +1100
Subject: [PATCH] Update cancel URL handling in HTTP and timer function
 templates

- Modify header template to use explicit `cancel_url` parameter
- Add `cancel_url` to new timer and HTTP function templates
- Remove default URL fallback in header template
---
 templates/dashboard/http_functions/header.html | 5 ++---
 templates/dashboard/http_functions/new.html    | 1 +
 templates/dashboard/timer_functions/edit.html  | 3 ++-
 templates/dashboard/timer_functions/new.html   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/dashboard/http_functions/header.html b/templates/dashboard/http_functions/header.html
index 8094a32..ab41c9c 100644
--- a/templates/dashboard/http_functions/header.html
+++ b/templates/dashboard/http_functions/header.html
@@ -92,9 +92,8 @@
         </div>
 
         <!-- Cancel Button (right side) -->
-        <button class="group flex flex-col items-center text-gray-500 hover:text-blue-600"
-            hx-get="{{ cancel_url|default(url_for('dashboard_http_functions')) }}" hx-target="#container"
-            hx-swap="innerHTML" hx-push-url="true">
+        <button class="group flex flex-col items-center text-gray-500 hover:text-blue-600" hx-get="{{ cancel_url }}"
+            hx-target="#container" hx-swap="innerHTML" hx-push-url="true">
             <div class="p-2 rounded-lg group-hover:bg-blue-50">
                 <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                     stroke-width="1.5" stroke="currentColor">
diff --git a/templates/dashboard/http_functions/new.html b/templates/dashboard/http_functions/new.html
index 2b6794a..a8c7f97 100644
--- a/templates/dashboard/http_functions/new.html
+++ b/templates/dashboard/http_functions/new.html
@@ -10,6 +10,7 @@ show_logs=False,
 show_client=False,
 show_link=False,
 dashboardUrl=url_for('dashboard_http_functions'),
+cancel_url=url_for('dashboard_http_functions'),
 title='New HTTP Function')
 }}
 
diff --git a/templates/dashboard/timer_functions/edit.html b/templates/dashboard/timer_functions/edit.html
index 1181938..9d65e0e 100644
--- a/templates/dashboard/timer_functions/edit.html
+++ b/templates/dashboard/timer_functions/edit.html
@@ -2,7 +2,8 @@
 
 {% block page %}
 
-{{ render_partial('dashboard/http_functions/header.html', function_id=function_id,
+{{ render_partial('dashboard/http_functions/header.html',
+function_id=function_id,
 active_tab='edit',
 show_edit_form=True,
 show_logs=True,
diff --git a/templates/dashboard/timer_functions/new.html b/templates/dashboard/timer_functions/new.html
index 11df49d..537b903 100644
--- a/templates/dashboard/timer_functions/new.html
+++ b/templates/dashboard/timer_functions/new.html
@@ -9,7 +9,7 @@ show_refresh=False,
 show_logs=False,
 show_client=False,
 show_link=False,
-dashboardUrl=url_for('timer.overview'),
+cancel_url=url_for('timer.overview'),
 title='New Timer Function')
 }}