Merge branch 'release/v1.17'

Harvard-University-iCommons · Jan 16, 2019 · e052aed · e052aed
2 parents ec94212 + 238dccf
commit e052aed
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/canvas_manage_course/requirements/base.txt b/canvas_manage_course/requirements/base.txt
@@ -1,7 +1,7 @@
 boto3==1.4.4
-Django==1.11.9
+Django==1.11.16
 cx-Oracle==6.1
-django-cached-authentication-middleware==0.2.1
+django-cached-authentication-middleware==0.2.2
 django-redis-cache==1.7.1
 hiredis==0.2.0
 kitchen==1.2.4
@@ -10,7 +10,7 @@ psycopg2==2.7.3.2
 requests==2.13.0
 
 git+ssh://[email protected]/penzance/[email protected]#egg=canvas-python-sdk==0.10.2
-git+ssh://[email protected]/Harvard-University-iCommons/django-auth-lti.git@v1.2.9#egg=django-auth-lti==1.2.9
+git+ssh://[email protected]/Harvard-University-iCommons/django-auth-lti.git@v1.3.0#egg=django-auth-lti==1.3.0
 
 git+ssh://[email protected]/Harvard-University-iCommons/[email protected]#egg=django-icommons-common[async]==v1.37.1
 git+ssh://[email protected]/Harvard-University-iCommons/[email protected]#egg=django-icommons-ui==1.5.3

diff --git a/canvas_manage_course/settings/base.py b/canvas_manage_course/settings/base.py
@@ -15,6 +15,8 @@
 import os
 import warnings
 
+# Need to import patch_reverse here to override the loading order of Django's reverse function.
+from django_auth_lti import patch_reverse
 from django.core.urlresolvers import reverse_lazy
 
 from .secure import SECURE_SETTINGS
@@ -29,7 +31,7 @@
 
 # Application definition
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'async',
     'canvas_manage_course',
     'class_roster',
@@ -48,20 +50,20 @@
     'lti_school_permissions',
     'manage_people',
     'manage_sections',
-)
+]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'cached_auth.Middleware',
     'django_auth_lti.middleware_patched.MultiLTILaunchAuthMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.security.SecurityMiddleware',
-)
+]
 
-AUTHENTICATION_BACKENDS = (
+AUTHENTICATION_BACKENDS = [
     'django_auth_lti.backends.LTIAuthBackend',
-)
+]
 
 LOGIN_URL = reverse_lazy('lti_auth_error')
 

diff --git a/canvas_manage_course/settings/local.py b/canvas_manage_course/settings/local.py
@@ -5,8 +5,8 @@
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-INSTALLED_APPS += ('debug_toolbar', 'sslserver')
-MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+INSTALLED_APPS += ['debug_toolbar', 'sslserver']
+MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware']
 
 # For Django Debug Toolbar:
 INTERNAL_IPS = ('127.0.0.1', '10.0.2.2',)

diff --git a/canvas_manage_course/views.py b/canvas_manage_course/views.py
@@ -5,7 +5,7 @@
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse
 from django.shortcuts import redirect, render
-from django.urls import reverse
+from django.core.urlresolvers import reverse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_http_methods
 from ims_lti_py.tool_config import ToolConfig
@@ -21,7 +21,7 @@
 @require_http_methods(['GET'])
 def tool_config(request):
 
-    url = "https://{}{}".format(request.get_host(), reverse('lti_launch'))
+    url = "https://{}{}".format(request.get_host(), reverse('lti_launch', exclude_resource_link_id=True))
 
     title = 'Manage Course'
     lti_tool_config = ToolConfig(