Merge pull request #42 from eurofurence/bugfix/34-back_button_error_n…

…on_admin Bugfix #34 - back button error - goodies
eurofurence · Sep 8, 2024 · 924fd02 · 924fd02
2 parents bc43500 + d3b257c
commit 924fd02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/resources/views/admin/user/edit-goodie.twig b/resources/views/admin/user/edit-goodie.twig
@@ -9,7 +9,7 @@
 {% block content %}
     <div class="container">
         <h1>
-            {{ m.back(url('/admin-active')) }}
+            {{ m.back(url(previousUrl)) }}
             {{ block('title') }}: <small>{{ m.user(userdata) }}</small>
         </h1>
 

diff --git a/src/Controllers/Admin/UserGoodieController.php b/src/Controllers/Admin/UserGoodieController.php
@@ -50,11 +50,15 @@ public function editGoodie(Request $request): Response
 
         $user = $this->user->findOrFail($userId);
 
+        // Get the previous page URL (referrer)
+        $previousUrl = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/';
+
         return $this->response->withView(
             'admin/user/edit-goodie.twig',
             [
                 'userdata' => $user,
                 'is_tshirt' => $this->config->get('goodie_type') === GoodieType::Tshirt->value,
+                'previousUrl' => $previousUrl
             ]
         );
     }