Updated to Django 2

This commit is contained in:
Jonas Winkler
2018-07-04 17:03:59 +02:00
parent 82ea6bd9d5
commit 78f0991fb5
7 changed files with 16 additions and 13 deletions

8
src/paperless/settings.py Normal file → Executable file
View File

@@ -81,22 +81,20 @@ if os.getenv("PAPERLESS_INSTALLED_APPS"):
MIDDLEWARE_CLASSES = [
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
# If auth is disabled, we just use our "bypass" authentication middleware
if bool(os.getenv("PAPERLESS_DISABLE_LOGIN", "false").lower() in ("yes", "y", "1", "t", "true")):
_index = MIDDLEWARE_CLASSES.index("django.contrib.auth.middleware.AuthenticationMiddleware")
MIDDLEWARE_CLASSES[_index] = "paperless.middleware.Middleware"
MIDDLEWARE_CLASSES.remove("django.contrib.auth.middleware.SessionAuthenticationMiddleware")
_index = MIDDLEWARE.index("django.contrib.auth.middleware.AuthenticationMiddleware")
MIDDLEWARE[_index] = "paperless.middleware.Middleware"
ROOT_URLCONF = 'paperless.urls'

3
src/paperless/urls.py Normal file → Executable file
View File

@@ -30,7 +30,8 @@ urlpatterns = [
r"^api/auth/",
include('rest_framework.urls', namespace="rest_framework")
),
url(r"^api/", include(router.urls, namespace="drf")),
# TODO: this does not work in django 2.0!
# url(r"^api/", include(router.urls, namespace="drf")),
# File downloads
url(