From eb79e3a373fc1ca2a159858cbe5edfec4f8301bf Mon Sep 17 00:00:00 2001
From: Raymond Penners <raymond.penners@intenct.nl>
Date: Thu, 19 Sep 2024 17:07:50 +0200
Subject: [PATCH] fix(templates): Variables in base template overrule context
 vars

e.g. `signup_url` constructed in `get_context_data()` would not be used.
---
 allauth/templates/allauth/layouts/base.html   | 48 +++++++++----------
 .../templates/allauth/layouts/base.html       | 14 +++---
 .../templates/allauth/layouts/manage.html     | 30 ++++++------
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/allauth/templates/allauth/layouts/base.html b/allauth/templates/allauth/layouts/base.html
index 9d4c0d201d..716c3586d7 100644
--- a/allauth/templates/allauth/layouts/base.html
+++ b/allauth/templates/allauth/layouts/base.html
@@ -25,53 +25,53 @@
                 <strong>{% trans "Menu:" %}</strong>
                 <ul>
                     {% if user.is_authenticated %}
-                        {% url 'account_email' as email_url %}
-                        {% if email_url %}
+                        {% url 'account_email' as email_url_ %}
+                        {% if email_url_ %}
                             <li>
-                                <a href="{{ email_url }}">{% trans "Change Email" %}</a>
+                                <a href="{{ email_url_ }}">{% trans "Change Email" %}</a>
                             </li>
                         {% endif %}
-                        {% url 'account_change_password' as change_password_url %}
-                        {% if change_password_url %}
+                        {% url 'account_change_password' as change_password_url_ %}
+                        {% if change_password_url_ %}
                             <li>
-                                <a href="{{ change_password_url }}">{% trans "Change Password" %}</a>
+                                <a href="{{ change_password_url_ }}">{% trans "Change Password" %}</a>
                             </li>
                         {% endif %}
-                        {% url 'socialaccount_connections' as connections_url %}
-                        {% if connections_url %}
+                        {% url 'socialaccount_connections' as connections_url_ %}
+                        {% if connections_url_ %}
                             <li>
-                                <a href="{{ connections_url }}">{% trans "Account Connections" %}</a>
+                                <a href="{{ connections_url_ }}">{% trans "Account Connections" %}</a>
                             </li>
                         {% endif %}
-                        {% url 'mfa_index' as mfa_url %}
-                        {% if mfa_url %}
+                        {% url 'mfa_index' as mfa_url_ %}
+                        {% if mfa_url_ %}
                             <li>
-                                <a href="{{ mfa_url }}">{% trans "Two-Factor Authentication" %}</a>
+                                <a href="{{ mfa_url_ }}">{% trans "Two-Factor Authentication" %}</a>
                             </li>
                         {% endif %}
-                        {% url 'usersessions_list' as usersessions_list_url %}
-                        {% if usersessions_list_url %}
+                        {% url 'usersessions_list' as usersessions_list_url_ %}
+                        {% if usersessions_list_url_ %}
                             <li>
-                                <a href="{{ usersessions_list_url }}">{% trans "Sessions" %}</a>
+                                <a href="{{ usersessions_list_url_ }}">{% trans "Sessions" %}</a>
                             </li>
                         {% endif %}
-                        {% url 'account_logout' as logout_url %}
-                        {% if logout_url %}
+                        {% url 'account_logout' as logout_url_ %}
+                        {% if logout_url_ %}
                             <li>
-                                <a href="{{ logout_url }}">{% trans "Sign Out" %}</a>
+                                <a href="{{ logout_url_ }}">{% trans "Sign Out" %}</a>
                             </li>
                         {% endif %}
                     {% else %}
-                        {% url 'account_login' as login_url %}
-                        {% if login_url %}
+                        {% url 'account_login' as login_url_ %}
+                        {% if login_url_ %}
                             <li>
-                                <a href="{{ login_url }}">{% trans "Sign In" %}</a>
+                                <a href="{{ login_url_ }}">{% trans "Sign In" %}</a>
                             </li>
                         {% endif %}
-                        {% url 'account_signup' as signup_url %}
-                        {% if signup_url %}
+                        {% url 'account_signup' as signup_url_ %}
+                        {% if signup_url_ %}
                             <li>
-                                <a href="{{ signup_url }}">{% trans "Sign Up" %}</a>
+                                <a href="{{ signup_url_ }}">{% trans "Sign Up" %}</a>
                             </li>
                         {% endif %}
                     {% endif %}
diff --git a/examples/regular-django/example/templates/allauth/layouts/base.html b/examples/regular-django/example/templates/allauth/layouts/base.html
index 5e1637266b..b52a1477c8 100644
--- a/examples/regular-django/example/templates/allauth/layouts/base.html
+++ b/examples/regular-django/example/templates/allauth/layouts/base.html
@@ -54,18 +54,18 @@
                                 </select>
                             </form>
                             {% if user.is_authenticated %}
-                                {% url 'account_email' as email_url %}
-                                {% url 'socialaccount_connections' as socialaccount_url %}
-                                {% if email_url or socialaccount_url %}
-                                    <a href="{% if email_url %}{{ email_url }}{% else %}{{ socialaccount_url }}{% endif %}"
+                                {% url 'account_email' as email_url_ %}
+                                {% url 'socialaccount_connections' as socialaccount_url_ %}
+                                {% if email_url_ or socialaccount_url_ %}
+                                    <a href="{% if email_url_ %}{{ email_url_ }}{% else %}{{ socialaccount_url_ }}{% endif %}"
                                        class="btn btn-secondary">Manage Account</a>
                                 {% endif %}
                                 <a href="{% url 'account_logout' %}" class="btn btn-danger">{% translate "Sign Out" %}</a>
                             {% else %}
                                 <a href="{% url 'account_login' %}" class="btn btn-outline-light">{% translate "Sign In" %}</a>
-                                {% url 'account_signup' as signup_url %}
-                                {% if signup_url %}
-                                    <a href="{{ signup_url }}" class="btn btn-success">{% translate "Sign Up" %}</a>
+                                {% url 'account_signup' as signup_url_ %}
+                                {% if signup_url_ %}
+                                    <a href="{{ signup_url_ }}" class="btn btn-success">{% translate "Sign Up" %}</a>
                                 {% endif %}
                             {% endif %}
                         </div>
diff --git a/examples/regular-django/example/templates/allauth/layouts/manage.html b/examples/regular-django/example/templates/allauth/layouts/manage.html
index 7a53c1dc7b..f46660a582 100644
--- a/examples/regular-django/example/templates/allauth/layouts/manage.html
+++ b/examples/regular-django/example/templates/allauth/layouts/manage.html
@@ -4,39 +4,39 @@
     <div class="flex-grow-1 d-flex flex-row">
         <aside class="col-md-2 text-bg-dark ">
             <ul class="p-3 nav nav-pills flex-column">
-                {% url 'account_email' as email_url %}
-                {% if email_url %}
+                {% url 'account_email' as email_url_ %}
+                {% if email_url_ %}
                     <li class="nav-item">
                         <a class="{% block nav_class_email %}nav-link text-white{% endblock %}"
-                           href="{% url 'account_email' %}">Change Email</a>
+                           href="{{ email_url_ }}">Change Email</a>
                     </li>
                 {% endif %}
-                {% url 'account_change_password' as change_password_url %}
-                {% if change_password_url %}
+                {% url 'account_change_password' as change_password_url_ %}
+                {% if change_password_url_ %}
                     <li class="nav-item">
                         <a class="{% block nav_class_password %}nav-link text-white{% endblock %}"
-                           href="{% url 'account_change_password' %}">Change Password</a>
+                           href="{{ change_password_url_ }}">Change Password</a>
                     </li>
                 {% endif %}
-                {% url 'socialaccount_connections' as connections_url %}
-                {% if connections_url %}
+                {% url 'socialaccount_connections' as connections_url_ %}
+                {% if connections_url_ %}
                     <li class="nav-item">
                         <a class="{% block nav_class_socialaccount %}nav-link text-white{% endblock %}"
-                           href="{{ connections_url }}">Third-Party Accounts</a>
+                           href="{{ connections_url_ }}">Third-Party Accounts</a>
                     </li>
                 {% endif %}
-                {% url 'mfa_index' as mfa_index_url %}
-                {% if mfa_index_url %}
+                {% url 'mfa_index' as mfa_index_url_ %}
+                {% if mfa_index_url_ %}
                     <li class="nav-item">
                         <a class="{% block nav_class_mfa %}nav-link text-white{% endblock %}"
-                           href="{{ mfa_index_url }}">Two-Factor Authentication</a>
+                           href="{{ mfa_index_url_ }}">Two-Factor Authentication</a>
                     </li>
                 {% endif %}
-                {% url 'usersessions_list' as usersessions_list_url %}
-                {% if usersessions_list_url %}
+                {% url 'usersessions_list' as usersessions_list_url_ %}
+                {% if usersessions_list_url_ %}
                     <li class="nav-item">
                         <a class="{% block nav_class_usersessions %}nav-link text-white{% endblock %}"
-                           href="{{ usersessions_list_url }}">Sessions</a>
+                           href="{{ usersessions_list_url_ }}">Sessions</a>
                     </li>
                 {% endif %}
             </ul>