Merge pull request #968 from CodingPirates/redirect-user-after-login

Redirect bruger efter login
CodingPirates · Sep 24, 2023 · 2d1e581 · 2d1e581
2 parents 88d80cb + 1766372
commit 2d1e581
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/members/templates/members/activities.html b/members/templates/members/activities.html
@@ -239,14 +239,14 @@ <h2>Nuværende og kommende aktiviteter</h2>
                           {% if activity.open_invite %}
                             <a
                               class="button-success"
-                              href="{% url 'person_login' %}"
+                              href="{% url 'person_login' %}?next={{request.path}}"
                             >
                               Tilmeld
                             </a>
                           {% else %}
                             <a
                               class="button-success"
-                              href="{% url 'person_login' %}"
+                              href="{% url 'person_login' %}?next={{request.path}}"
                             >
                               Opskriv på venteliste
                             </a>

diff --git a/members/templates/members/activity_signup.html b/members/templates/members/activity_signup.html
@@ -88,8 +88,8 @@ <h1>{{activity.department.name}}: <small>{{activity.name}}</small></h1>
       {% else %}
         {% if not family %}
           <hr>
-          <a href="{% url 'person_login' %}">Log ind</a>
-          eller 
+          <a href="{% url 'person_login' %}?next={{request.path}}">Log ind</a>
+          eller
           <a href="{% url 'account_create' %}">tilmeld dit barn</a>
           for at tilmelde dig denne aktivitet.
         {% else %}

diff --git a/members/templates/members/header.html b/members/templates/members/header.html
@@ -18,7 +18,7 @@
     {% else %}
         <a href="{% url "account_create" %}">Tilmeld barn</a>
         <a href="{% url "volunteer_signup" %}">Bliv frivillig</a>
-        <a id="login-logout" href="{% url 'person_login' %}">Log ind</a>
+        <a id="login-logout" href="{% url 'person_login' %}?next={{request.path}}">Log ind</a>
     {% endif %}
     <a href="https://codingpirates.dk" target="_blank">
         <img src="{% static "logo.png" %}"/>