jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to Django 2.1

Browse source
This commit is contained in:
Yohan Boniface 2018-08-15 17:42:51 +02:00
parent 6ad9df8044
commit d63e92fee8
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
requirements.txt
View file

@ -1,4 +1,4 @@
Django==2.0.7 Django==2.1
django-agnocomplete==0.12.2 django-agnocomplete==0.12.2
django-compressor==2.2 django-compressor==2.2
Pillow==5.2.0 Pillow==5.2.0

2
umap/templatetags/umap_tags.py
View file

@ -77,7 +77,7 @@ def notag(s):
@register.simple_tag(takes_context=True) @register.simple_tag(takes_context=True)
def paginate_querystring(context, page): def paginate_querystring(context, page):
qs = copy(context["request"].GET) qs = copy(context["request"].GET)
qs["p"] = page qs["p"] = str(page)
return qs.urlencode() return qs.urlencode()

8
umap/urls.py
View file

@ -1,11 +1,9 @@
from django.conf import settings from django.conf import settings
from django.conf.urls import include, url from django.conf.urls import include, url
from django.urls import path
from django.conf.urls.i18n import i18n_patterns from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.static import static from django.conf.urls.static import static
from django.contrib import admin from django.contrib import admin
from django.contrib.auth import views as auth_views from django.contrib.auth import views as auth_views
from django.contrib.auth.views import login
from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.views.decorators.cache import (cache_control, cache_page, from django.views.decorators.cache import (cache_control, cache_page,
never_cache) never_cache)
@ -25,10 +23,10 @@ urlpatterns = [
name='map_short_url'), name='map_short_url'),
url(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy), url(r'^ajax-proxy/$', cache_page(180)(views.ajax_proxy),
name='ajax-proxy'), name='ajax-proxy'),
url(r'^change-password/', auth_views.password_change, url(r'^change-password/', auth_views.PasswordChangeView.as_view(),
{'template_name': 'umap/password_change.html'}, {'template_name': 'umap/password_change.html'},
name='password_change'), name='password_change'),
url(r'^change-password-done/', auth_views.password_change_done, url(r'^change-password-done/', auth_views.PasswordChangeDoneView.as_view(),
{'template_name': 'umap/password_change_done.html'}, {'template_name': 'umap/password_change_done.html'},
name='password_change_done'), name='password_change_done'),
url(r'^i18n/', include('django.conf.urls.i18n')), url(r'^i18n/', include('django.conf.urls.i18n')),
@ -36,7 +34,7 @@ urlpatterns = [
] ]
i18n_urls = [ i18n_urls = [
url(r'^login/$', jsonize_view(login), name='login'), # noqa url(r'^login/$', jsonize_view(auth_views.LoginView.as_view()), name='login'), # noqa
url(r'^login/popup/end/$', views.LoginPopupEnd.as_view(), url(r'^login/popup/end/$', views.LoginPopupEnd.as_view(),
name='login_popup_end'), name='login_popup_end'),
url(r'^logout/$', views.logout, name='logout'), url(r'^logout/$', views.logout, name='logout'),