From ebe78713efdcbf912484161861f56fd58a9d54cb Mon Sep 17 00:00:00 2001 From: "Julian M. Kunkel" Date: Sun, 6 May 2018 00:04:26 +0100 Subject: [PATCH] Towards django2.0 --- .gitignore | 2 ++ dev/apache-local.conf | 2 ++ dev/run-internal.sh | 1 - scripts/update-courses.sh | 3 ++- src/courses/views.py | 10 ++++++---- src/frontend/views.py | 4 ++-- src/main/settings.py | 9 ++++----- src/rest/views.py | 2 +- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f5bdd21..3bfbb90 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ run +*.pyc +__pycache__ diff --git a/dev/apache-local.conf b/dev/apache-local.conf index 4525b8d..98e5d1a 100644 --- a/dev/apache-local.conf +++ b/dev/apache-local.conf @@ -2,6 +2,8 @@ ServerAdmin admin@hps.vi4io.org #ServerName oer.hps.vi4io.org + #/etc/apache2/apache2.conf => LogLevel info + WSGIScriptAlias / "/data/src/main/wsgi.py" WSGIDaemonProcess hoou python-home=/data/run/virtualenv python-path=/data/src/ home=/data/src/ inactivity-timeout=10 request-timeout=10 WSGIProcessGroup hoou diff --git a/dev/run-internal.sh b/dev/run-internal.sh index 2145604..8ed63e6 100755 --- a/dev/run-internal.sh +++ b/dev/run-internal.sh @@ -19,7 +19,6 @@ if [[ ! -e $V ]] ; then source $V/bin/activate pip3 install -U -r /data/dev/requirements.txt python3 ./manage.py migrate - python3 ./manage.py collectstatic fi source $V/bin/activate diff --git a/scripts/update-courses.sh b/scripts/update-courses.sh index be877a5..97b325c 100755 --- a/scripts/update-courses.sh +++ b/scripts/update-courses.sh @@ -6,4 +6,5 @@ cd /data/src export GENERATED_PATH=/data/run/oer export OER_SRC_DIR=/data/oer export PLATFORM_PATH=/data/src -python3 manage.py import-courses --sources=/data/oer/courses --formats=/data/oer/exercise-formats/ +python3 ./manage.py import-courses --sources=/data/oer/courses --formats=/data/oer/exercise-formats/ +python3 ./manage.py collectstatic diff --git a/src/courses/views.py b/src/courses/views.py index 9d69060..5e0ab69 100644 --- a/src/courses/views.py +++ b/src/courses/views.py @@ -8,6 +8,8 @@ from django.urls import reverse from django.http import HttpResponse from django.http import HttpResponseRedirect +from django.contrib.auth.decorators import login_required + from django import template from django.template.defaultfilters import stringfilter @@ -40,7 +42,7 @@ def course(request, cid): first_section = course.sections.first() first_slide = first_section.slides.first() - if request.user.is_authenticated(): + if request.user.is_authenticated: try: # when the user is merely opening the course, jump the last active section (better: last incomplete?) user_course = UserCourse.objects.get(course=course, user=request.user) @@ -64,7 +66,7 @@ def section(request, cid, seid): section = get_object_or_404(Section, pk=seid) first_slide = section.slides.first() - if request.user.is_authenticated(): + if request.user.is_authenticated: try: user_course = UserCourse.objects.get(course=course, user=request.user) @@ -97,7 +99,7 @@ def slide(request, cid, seid, slid): - if request.user.is_authenticated(): + if request.user.is_authenticated: try: user_course = UserCourse.objects.get(course=course, user=request.user) # simply update last user_course action @@ -112,7 +114,7 @@ def slide(request, cid, seid, slid): user_solution = None - if request.user.is_authenticated(): + if request.user.is_authenticated: try: user_solution = UserSolution.objects.get(slide=slide, user=request.user) diff --git a/src/frontend/views.py b/src/frontend/views.py index 9ce9bfa..f42e6b3 100644 --- a/src/frontend/views.py +++ b/src/frontend/views.py @@ -36,7 +36,7 @@ def attribution(request): def dashboard(request): # only registered users can see their statistics - if not request.user.is_authenticated(): + if not request.user.is_authenticated: return HttpResponseRedirect('/') else: data = {} @@ -47,7 +47,7 @@ def dashboard(request): @login_required def settings(request): # only registered users have settings - if not request.user.is_authenticated(): + if not request.user.is_authenticated: return HttpResponseRedirect('/') else: data = {} diff --git a/src/main/settings.py b/src/main/settings.py index 29a40d0..2c1e9c6 100644 --- a/src/main/settings.py +++ b/src/main/settings.py @@ -23,7 +23,7 @@ SECRET_KEY = 'pxf234t25323vasfk3t202v2232v124' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False -#DEBUG = True +DEBUG = True ALLOWED_HOSTS = ['localhost', 'oer.hps.vi4io.org'] @@ -51,14 +51,13 @@ INSTALLED_APPS = ( 'tools' ) -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = ( # 'djangosecure.middleware.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', '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', 'django.middleware.security.SecurityMiddleware', ) diff --git a/src/rest/views.py b/src/rest/views.py index a07e282..a5c733e 100644 --- a/src/rest/views.py +++ b/src/rest/views.py @@ -214,7 +214,7 @@ def job_new(request): # Also create/update the user solution. user_solution = None - if request.user.is_authenticated(): + if request.user.is_authenticated: try: item, created = UserSolution.objects.get_or_create(slide=slide, user=request.user) user_solution = item