diff --git a/common/middleware.py b/common/middleware.py index 91d13df..1f2069e 100644 --- a/common/middleware.py +++ b/common/middleware.py @@ -1,8 +1,12 @@ -from django.core.urlresolvers import reverse +from django.urls import reverse from django.http import HttpResponseRedirect class LoginRequiredMiddleware: - def process_request(self, request): - if not request.user.is_authenticated() and not "/admin" in request.path_info: + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + if not request.user.is_authenticated and not "/admin" in request.path_info: return HttpResponseRedirect(reverse('admin:index')) + return self.get_response(request) diff --git a/common/settings.py b/common/settings.py index 86089c7..3ada0de 100644 --- a/common/settings.py +++ b/common/settings.py @@ -59,7 +59,7 @@ STATIC_URL = '/static/' # Set it in local_settings.py. SECRET_KEY = '' -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -68,7 +68,7 @@ MIDDLEWARE_CLASSES = ( # Uncomment the next line for simple clickjacking protection: # 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'common.middleware.LoginRequiredMiddleware', -) +] ROOT_URLCONF = 'common.urls' diff --git a/common/urls.py b/common/urls.py index dd587c7..8d6f6f3 100644 --- a/common/urls.py +++ b/common/urls.py @@ -7,7 +7,7 @@ from stages import views urlpatterns = [ url(r'^$', RedirectView.as_view(url='/admin/', permanent=True), name='home'), - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), url(r'^data-import/', views.StudentImportView.as_view(), name='tabimport'), url(r'^attribution/$', views.AttributionView.as_view(), name='attribution'), diff --git a/requirements.txt b/requirements.txt index baff504..4f89269 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.9.9 +Django==1.10.1 tabimport openpyxl==2.2.6 xlrd diff --git a/stages/tests.py b/stages/tests.py index b053ad0..7e2198c 100644 --- a/stages/tests.py +++ b/stages/tests.py @@ -2,8 +2,8 @@ import json from datetime import date from django.contrib.auth.models import User -from django.core.urlresolvers import reverse from django.test import TestCase +from django.urls import reverse from .models import ( Level, Domain, Section, Klass, Period, Student, Corporation, Availability, diff --git a/stages/views.py b/stages/views.py index 212e434..9f81750 100644 --- a/stages/views.py +++ b/stages/views.py @@ -6,10 +6,10 @@ from tabimport import FileFactory from django.conf import settings from django.contrib import messages -from django.core.urlresolvers import reverse from django.db.models import Case, Count, When from django.http import HttpResponse, HttpResponseNotAllowed, HttpResponseRedirect from django.shortcuts import get_object_or_404 +from django.urls import reverse from django.utils.translation import ugettext as _ from django.views.generic import DetailView, FormView, TemplateView, ListView