Upgrade code to support Django 1.10
This commit is contained in:
parent
90bcdbbc06
commit
f8b1afcf72
6 changed files with 13 additions and 9 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Django==1.9.9
|
||||
Django==1.10.1
|
||||
tabimport
|
||||
openpyxl==2.2.6
|
||||
xlrd
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue