From a14d8da621e5424c78ce7f9db722af2687a0c6b7 Mon Sep 17 00:00:00 2001
From: Niklas Deutschmann <sonstharmlos@noreply.codeberg.org>
Date: Fri, 1 May 2026 16:47:31 +0200
Subject: [PATCH] Paging in activity edit view ("Cancel" and "Submit" buttons
 should work now)

---
 .../fitpub/controller/ActivitiesViewController.java        | 7 +++----
 src/main/resources/templates/activities/edit.html          | 6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/javahippie/fitpub/controller/ActivitiesViewController.java b/src/main/java/net/javahippie/fitpub/controller/ActivitiesViewController.java
index 78c4ff7..c57d7d2 100644
--- a/src/main/java/net/javahippie/fitpub/controller/ActivitiesViewController.java
+++ b/src/main/java/net/javahippie/fitpub/controller/ActivitiesViewController.java
@@ -36,9 +36,7 @@ public class ActivitiesViewController {
     @GetMapping("/{id}")
     public String viewActivity(@PathVariable String id, @RequestParam String page, Model model) {
         // The activity data will be loaded via JavaScript API calls
-        if (page != null) {
-            model.addAttribute("page", page);
-        }
+        model.addAttribute("page", page != null ? page : "1");
         return "activities/detail";
     }
 
@@ -46,8 +44,9 @@ public class ActivitiesViewController {
      * Show activity edit page
      */
     @GetMapping("/{id}/edit")
-    public String editActivity(@PathVariable String id) {
+    public String editActivity(@PathVariable String id, @RequestParam String page, Model model) {
         // The activity data will be loaded via JavaScript API calls
+        model.addAttribute("page", page != null ? page : "1");
         return "activities/edit";
     }
 }
diff --git a/src/main/resources/templates/activities/edit.html b/src/main/resources/templates/activities/edit.html
index fb97558..d826cbc 100644
--- a/src/main/resources/templates/activities/edit.html
+++ b/src/main/resources/templates/activities/edit.html
@@ -127,6 +127,7 @@
                             </div>
 
                             <!-- Submit Buttons -->
+                            <p th:text="${'Page: ' + page}"></p>
                             <div class="d-grid gap-2 d-md-flex justify-content-md-end">
                                 <a th:href="@{/activities}" class="btn btn-outline-secondary" id="cancelBtn">
                                     <i class="bi bi-x-circle"></i> Cancel
@@ -165,6 +166,7 @@
         <script th:inline="javascript">
             document.addEventListener('DOMContentLoaded', function() {
                 const activityId = window.location.pathname.split('/').slice(-2, -1)[0];
+                const page = new URLSearchParams(window.location.search).get('page') || 1;
                 const form = document.getElementById('editForm');
                 const loadingIndicator = document.getElementById('loadingIndicator');
                 const editCard = document.getElementById('editCard');
@@ -229,7 +231,7 @@
                     `;
 
                     // Update cancel button to go back to activity detail
-                    cancelBtn.href = `/activities/${activityId}`;
+                    cancelBtn.href = `/activities/${activityId}?page=${page}`;
                 }
 
                 function renderMap(simplifiedTrack) {
@@ -295,7 +297,7 @@
 
                             // Redirect to activity detail page
                             setTimeout(() => {
-                                window.location.href = `/activities/${activityId}`;
+                                window.location.href = `/activities/${activityId}?page=${page}`;
                             }, 1500);
                         } else {
                             const errorData = await response.json();