[#2036] Fixed missing 'next' parameter in link tags

maykinmedia · Apr 18, 2024 · 6c89004 · 6c89004
1 parent ad225a4
commit 6c89004
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/src/open_inwoner/accounts/templates/registration/login.html b/src/open_inwoner/accounts/templates/registration/login.html
@@ -36,7 +36,9 @@ <h1 class="utrecht-heading-1">{% trans 'Welkom' %}</h1>
                                             <img class="digid-logo__image" src="{% static 'accounts/digid_logo.svg' %}" alt="DigiD inlogpagina">
                                         </a>
                                         {% url 'digid_oidc:init' as href %}
-                                        {% link href=href text=_('Inloggen met DigiD') primary=True icon='east' extra_classes="link--next link--digid" %}
+                                        {% with href|addnexturl:next as href_with_next %}
+                                            {% link href=href_with_next text=_('Inloggen met DigiD') primary=True icon='east' extra_classes="link--next link--digid" %}
+                                        {% endwith %}
                                     {% endrender_card %}
                                 {% else %}
                                     {% render_card direction='horizontal' tinted=True compact=True %}
@@ -85,20 +87,20 @@ <h1 class="utrecht-heading-1">{% trans 'Welkom' %}</h1>
                                 </div>
 
                                 {# Hide mail login initially #}
-                                    <div class="column column--start-4 column--span-5" id="column__login-form">
-                                        {% if login_allow_registration %}
-                                            {% render_card tinted=True compact=True %}
-                                                {% render_form id="login-form" method="POST" form=form show_required=True %}
-                                                    {% csrf_token %}
-                                                    <input type="hidden" name="next" value="{{ next }}"/>
-                                                    {% input form.username %}
-                                                    {% input form.password %}
-                                                    {% button text=_('Wachtwoord vergeten?') href='password_reset' secondary=True transparent=True align='right' %}
-                                                    {% form_actions primary_text=_("Inloggen") primary_icon="arrow_forward" single=True %}
-                                                {% endrender_form %}
-                                            {% endrender_card %}
-                                        {% endif %}
-                                    </div>
+                                <div class="column column--start-4 column--span-5" id="column__login-form">
+                                    {% if login_allow_registration %}
+                                        {% render_card tinted=True compact=True %}
+                                            {% render_form id="login-form" method="POST" form=form show_required=True %}
+                                                {% csrf_token %}
+                                                <input type="hidden" name="next" value="{{ next }}"/>
+                                                {% input form.username %}
+                                                {% input form.password %}
+                                                {% button text=_('Wachtwoord vergeten?') href='password_reset' secondary=True transparent=True align='right' %}
+                                                {% form_actions primary_text=_("Inloggen") primary_icon="arrow_forward" single=True %}
+                                            {% endrender_form %}
+                                        {% endrender_card %}
+                                    {% endif %}
+                                </div>
                                 {# End hidden #}
 
                                 {% render_column start=4 span=5 %}
@@ -133,7 +135,9 @@ <h2 class="tab__heading-4">Of registreer</h2>
                                             <img class="eherkenning-logo__image" src="{% static 'accounts/eherkenning.png' %}" height=30 alt="eHerkenning inlogpagina">
                                         </a>
                                         {% url 'eherkenning_oidc:init' as href %}
-                                        {% link href=href text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
+                                        {% with href|addnexturl:next as href_with_next %}
+                                            {% link href=href text=_('Inloggen met eHerkenning') primary=True icon='east' extra_classes="link--next link--eherkenning" %}
+                                        {% endwith %}
                                     {% endrender_card %}
                                 {% else %}
                                     {% render_card direction='horizontal' tinted=True %}