Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-proctoring
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-proctoring
Commits
1bfdc54f
Unverified
Commit
1bfdc54f
authored
Jan 22, 2018
by
Jeremy Bowman
Committed by
GitHub
Jan 22, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #404 from edx/jmbowman/PLAT-1888
PLAT-1888 Fix URL issues with Django 1.10
parents
b278badd
7f4841fb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
21 deletions
+6
-21
edx_proctoring/__init__.py
+1
-1
edx_proctoring/api.py
+4
-16
edx_proctoring/views.py
+1
-4
No files found.
edx_proctoring/__init__.py
View file @
1bfdc54f
...
@@ -4,6 +4,6 @@ The exam proctoring subsystem for the Open edX platform.
...
@@ -4,6 +4,6 @@ The exam proctoring subsystem for the Open edX platform.
from
__future__
import
absolute_import
from
__future__
import
absolute_import
__version__
=
'1.3.
5
'
__version__
=
'1.3.
6
'
default_app_config
=
'edx_proctoring.apps.EdxProctoringConfig'
# pylint: disable=invalid-name
default_app_config
=
'edx_proctoring.apps.EdxProctoringConfig'
# pylint: disable=invalid-name
edx_proctoring/api.py
View file @
1bfdc54f
...
@@ -1049,10 +1049,7 @@ def create_proctoring_attempt_status_email(user_id, exam_attempt_obj, course_nam
...
@@ -1049,10 +1049,7 @@ def create_proctoring_attempt_status_email(user_id, exam_attempt_obj, course_nam
return
None
return
None
email_template
=
loader
.
get_template
(
email_template_path
)
email_template
=
loader
.
get_template
(
email_template_path
)
try
:
try
:
course_info_url
=
reverse
(
course_info_url
=
reverse
(
'info'
,
args
=
[
exam_attempt_obj
.
proctored_exam
.
course_id
])
'courseware.views.views.course_info'
,
args
=
[
exam_attempt_obj
.
proctored_exam
.
course_id
]
)
except
NoReverseMatch
:
except
NoReverseMatch
:
log
.
exception
(
"Can't find course info url for course
%
s"
,
exam_attempt_obj
.
proctored_exam
.
course_id
)
log
.
exception
(
"Can't find course info url for course
%
s"
,
exam_attempt_obj
.
proctored_exam
.
course_id
)
...
@@ -1390,10 +1387,7 @@ def _resolve_prerequisite_links(exam, prerequisites):
...
@@ -1390,10 +1387,7 @@ def _resolve_prerequisite_links(exam, prerequisites):
jumpto_url
=
None
jumpto_url
=
None
if
prerequisite
[
'namespace'
]
in
JUMPTO_SUPPORTED_NAMESPACES
and
prerequisite
[
'name'
]:
if
prerequisite
[
'namespace'
]
in
JUMPTO_SUPPORTED_NAMESPACES
and
prerequisite
[
'name'
]:
try
:
try
:
jumpto_url
=
reverse
(
jumpto_url
=
reverse
(
'jump_to'
,
args
=
[
exam
[
'course_id'
],
prerequisite
[
'name'
]])
'courseware.views.views.jump_to'
,
args
=
[
exam
[
'course_id'
],
prerequisite
[
'name'
]]
)
except
NoReverseMatch
:
except
NoReverseMatch
:
log
.
exception
(
"Can't find jumpto url for course
%
s"
,
exam
[
'course_id'
])
log
.
exception
(
"Can't find jumpto url for course
%
s"
,
exam
[
'course_id'
])
...
@@ -1635,10 +1629,7 @@ def _get_timed_exam_view(exam, context, exam_id, user_id, course_id):
...
@@ -1635,10 +1629,7 @@ def _get_timed_exam_view(exam, context, exam_id, user_id, course_id):
progress_page_url
=
''
progress_page_url
=
''
try
:
try
:
progress_page_url
=
reverse
(
progress_page_url
=
reverse
(
'progress'
,
args
=
[
course_id
])
'courseware.views.views.progress'
,
args
=
[
course_id
]
)
except
NoReverseMatch
:
except
NoReverseMatch
:
log
.
exception
(
"Can't find progress url for course
%
s"
,
course_id
)
log
.
exception
(
"Can't find progress url for course
%
s"
,
course_id
)
...
@@ -1690,10 +1681,7 @@ def _get_proctored_exam_context(exam, attempt, course_id, is_practice_exam=False
...
@@ -1690,10 +1681,7 @@ def _get_proctored_exam_context(exam, attempt, course_id, is_practice_exam=False
total_time
=
humanized_time
(
attempt_time
)
total_time
=
humanized_time
(
attempt_time
)
progress_page_url
=
''
progress_page_url
=
''
try
:
try
:
progress_page_url
=
reverse
(
progress_page_url
=
reverse
(
'progress'
,
args
=
[
course_id
])
'courseware.views.views.progress'
,
args
=
[
course_id
]
)
except
NoReverseMatch
:
except
NoReverseMatch
:
log
.
exception
(
"Can't find progress url for course
%
s"
,
course_id
)
log
.
exception
(
"Can't find progress url for course
%
s"
,
course_id
)
...
...
edx_proctoring/views.py
View file @
1bfdc54f
...
@@ -519,10 +519,7 @@ class StudentProctoredExamAttemptCollection(AuthenticatedAPIView):
...
@@ -519,10 +519,7 @@ class StudentProctoredExamAttemptCollection(AuthenticatedAPIView):
try
:
try
:
# resolve the LMS url, note we can't assume we're running in
# resolve the LMS url, note we can't assume we're running in
# a same process as the LMS
# a same process as the LMS
exam_url_path
=
reverse
(
exam_url_path
=
reverse
(
'jump_to'
,
args
=
[
exam
[
'course_id'
],
exam
[
'content_id'
]])
'courseware.views.views.jump_to'
,
args
=
[
exam
[
'course_id'
],
exam
[
'content_id'
]]
)
except
NoReverseMatch
:
except
NoReverseMatch
:
LOG
.
exception
(
"Can't find exam url for course
%
s"
,
exam
[
'course_id'
])
LOG
.
exception
(
"Can't find exam url for course
%
s"
,
exam
[
'course_id'
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment