From aef53cd0ac0655d10bc482c035b5180b09e678dc Mon Sep 17 00:00:00 2001
From: karp <karp@cl.uni-heidelberg.de>
Date: Tue, 25 Jun 2024 11:25:00 +0000
Subject: [PATCH] Fix stacking query parameter
---
portal/static/js/components/pieces/Nav.mjs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/portal/static/js/components/pieces/Nav.mjs b/portal/static/js/components/pieces/Nav.mjs
index 3b8a0f5..7a6052c 100644
--- a/portal/static/js/components/pieces/Nav.mjs
+++ b/portal/static/js/components/pieces/Nav.mjs
@@ -1,6 +1,8 @@
import { NavPageLink } from "./NavPageLink.mjs"
import { logout, isLoggedIn } from "../../account.mjs"
+const hasQueryParam = (param, path) => param in m.parsePathname(path).params
+
export const Nav = {
view() {
return m("nav.box", [
@@ -60,7 +62,9 @@ export const Nav = {
iconOnly: true,
})
: m(NavPageLink, {
- href: `/login?next=${m.route.get() || "/"}`,
+ href: hasQueryParam("next", m.route.get())
+ ? m.route.get()
+ : `/login?next=${m.route.get() || "/"}`,
label: " Anmelden",
icon: "fa-solid fa-right-to-bracket",
}),
--
GitLab