From e046ed00e790fbb82b43de9404d8ca3955c8de2f Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 18 May 2022 16:23:02 +0200
Subject: Migration to Django 2.2 - many fixes

- remove redondant permissions
- fix missing kwargs for widget and form fields
- fix default to callable for model field
- quick and dirty fix for datepicker
- is_authenticated() -> is_authenticated
- fix registration urls
- remove six usage (no more python2)
---
 ishtar_common/templates/account_activation_email.txt              | 2 +-
 ishtar_common/templates/navbar.html                               | 6 +++---
 ishtar_common/templates/registration/activate.html                | 2 +-
 ishtar_common/templates/registration/activation_complete.html     | 2 +-
 ishtar_common/templates/registration/login.html                   | 2 +-
 ishtar_common/templates/registration/password_reset_complete.html | 2 +-
 ishtar_common/templates/registration/password_reset_email.html    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/account_activation_email.txt b/ishtar_common/templates/account_activation_email.txt
index 7498a86c7..fbd90ad58 100644
--- a/ishtar_common/templates/account_activation_email.txt
+++ b/ishtar_common/templates/account_activation_email.txt
@@ -5,7 +5,7 @@
  * {% trans "Login:" %} {{login}}
  * {% trans "Password:" %} {{password}}
 
-{% trans "You can log in here:" %} {{scheme}}://{{site}}{% url "auth_login" %}
+{% trans "You can log in here:" %} {{scheme}}://{{site}}{% url "login" %}
 
 {% trans "Thank you for you interest in the project." %}
 
diff --git a/ishtar_common/templates/navbar.html b/ishtar_common/templates/navbar.html
index bc244973c..d8e368bbc 100644
--- a/ishtar_common/templates/navbar.html
+++ b/ishtar_common/templates/navbar.html
@@ -30,17 +30,17 @@
                 <a class="dropdown-item" href="{% url 'profile' %}">
                     {% trans "Profile" %}
                 </a>
-                <a class="dropdown-item" href="{% url 'auth_password_change' %}">
+                <a class="dropdown-item" href="{% url 'password_change' %}">
                     {% trans "Change password" %}
                 </a>
-                <a class="dropdown-item" href="{% url 'auth_logout' %}">
+                <a class="dropdown-item" href="{% url 'logout' %}">
                     {% trans "Log out" %}
                 </a>
             </div>
         </li>
         {% else %}
         <li class="nav-item">
-            <a class="nav-link" href="{% url 'auth_login' %}">{% trans "Log in" %}</a>
+            <a class="nav-link" href="{% url 'login' %}">{% trans "Log in" %}</a>
         </li>
         {% endif %}
         {% if LANGUAGES|length > 1 %}
diff --git a/ishtar_common/templates/registration/activate.html b/ishtar_common/templates/registration/activate.html
index 0dcbccc00..261b38b1f 100644
--- a/ishtar_common/templates/registration/activate.html
+++ b/ishtar_common/templates/registration/activate.html
@@ -7,7 +7,7 @@
 
 <p>{% trans "Account successfully activated" %}</p>
 
-<p><a href="{% url auth_login %}">{% trans "Log in" %}</a></p>
+<p><a href="{% url 'login' %}">{% trans "Log in" %}</a></p>
 
 {% else %}
 
diff --git a/ishtar_common/templates/registration/activation_complete.html b/ishtar_common/templates/registration/activation_complete.html
index 7db8c186e..dbe6c15ed 100644
--- a/ishtar_common/templates/registration/activation_complete.html
+++ b/ishtar_common/templates/registration/activation_complete.html
@@ -5,7 +5,7 @@
 <div class='info'>
 <p>{% trans "You may now login with your username and password." %}</p>
 {% if not user.is_authenticated %}
-<a href="{% url "auth_login" %}">{% trans "Login now" %}</a>
+<a href="{% url 'login' %}">{% trans "Login now" %}</a>
 {% else %}
 <a href="/">{% trans "Home" %}</a>
 {% endif %}
diff --git a/ishtar_common/templates/registration/login.html b/ishtar_common/templates/registration/login.html
index 4d8e2f37b..452ef91ef 100644
--- a/ishtar_common/templates/registration/login.html
+++ b/ishtar_common/templates/registration/login.html
@@ -35,7 +35,7 @@
 <hr/>
 <div class="row justify-content-center">
     <div class="col-md-6">
-        <small class="text-secondary">{% trans "Forgot password?" %} <a href="{% url 'auth_password_reset' %}">{% trans "Reset it" %}</a> &ndash;
+        <small class="text-secondary">{% trans "Forgot password?" %} <a href="{% url 'password_reset' %}">{% trans "Reset it" %}</a> &ndash;
         {% trans "Not member?" %} <a href="{% url 'registration_register' %}">{% trans "Register" %}</a></small>
     </div>
 </div>
diff --git a/ishtar_common/templates/registration/password_reset_complete.html b/ishtar_common/templates/registration/password_reset_complete.html
index dfa3ce682..053270f78 100644
--- a/ishtar_common/templates/registration/password_reset_complete.html
+++ b/ishtar_common/templates/registration/password_reset_complete.html
@@ -5,6 +5,6 @@
 <div class='info'>
 <p>{% trans "Password reset successfully" %}</p>
 
-<p><a href="{% url auth_login %}">{% trans "Log in" %}</a></p>
+<p><a href="{% url 'login' %}">{% trans "Log in" %}</a></p>
 </div>
 {% endblock %}
diff --git a/ishtar_common/templates/registration/password_reset_email.html b/ishtar_common/templates/registration/password_reset_email.html
index a55c86958..05612cf58 100644
--- a/ishtar_common/templates/registration/password_reset_email.html
+++ b/ishtar_common/templates/registration/password_reset_email.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 {% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}:
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url auth_password_reset_confirm uidb36=uid, token=token %}
+{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb36=uid, token=token %}
 {% endblock %}
-- 
cgit v1.2.3