Browse Source

Upgrade to Django 1.10

Moving forward, step after step :-)
Jocelyn Delalande 6 years ago
parent
commit
5d439cc373

+ 1 - 1
requirements.txt

@@ -1,3 +1,3 @@
-Django==1.9.2
+Django>=1.10,<1.11
 PyYAML==3.11
 Markdown==2.6.5

+ 1 - 1
transparency/templates/registration/logged_out.html

@@ -3,4 +3,4 @@
 <p class="ui message">
   Vous avez été deconnecté ; vous pouvez <a href="{% url 'login' %}">vous reconnecter</a>.
 </p>
-{% endblock %}
+{% endblock %}

+ 1 - 1
transparency/templates/registration/login.html

@@ -3,7 +3,7 @@
 {% if form.errors %}
 <p class="ui message">Mauvais utilisateur / mot de passe, essaye encore..</p>
 {% endif %}
-<form method="post" class="ui form" action="{% url 'django.contrib.auth.views.login' %}">
+<form method="post" class="ui form" action="{% url 'admin:login' %}">
 {% csrf_token %}
   <div class="field">
     <label>{{ form.username.label_tag }}</label>

+ 3 - 2
transparency/urls.py

@@ -14,6 +14,7 @@ Including another URLconf
     2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
 """
 from django.conf.urls import include, url
+import django.contrib.auth.views
 from transparency.admin import admin_site
 import costs.urls
 import publicsite.urls
@@ -22,8 +23,8 @@ from django.views.generic import RedirectView
 
 urlpatterns = [
     url(r'^admin/', include(admin_site.urls)),
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
-    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', name='logout'),
+    url(r'^accounts/login/$', django.contrib.auth.views.login, name='login'),
+    url(r'^accounts/logout/$', django.contrib.auth.views.logout, name='logout'),
 #    url(r'^admin/', include(admin_site.urls)),
     url(r'^costs/', include(costs.urls)),
     url(r'^public/', include(publicsite.urls)),