Towards django2.0

.gitignore

@@ -1 +1,3 @@
 run
+*.pyc
+__pycache__

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

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
 

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

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)
 

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 = {}

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',
 )

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