Skip to content

Commit

Permalink
Merge pull request #816 from edx/bseverino/escalation-email-bug-fix
Browse files Browse the repository at this point in the history
Pass string into get_proctoring_escalation_email rather than object
  • Loading branch information
bseverino committed Mar 23, 2021
2 parents ddaa14c + ecc51fb commit 3c10294
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ Change Log
Unreleased
~~~~~~~~~~

[3.7.14] - 2021-03-19
~~~~~~~~~~~~~~~~~~~~~
* Fix issue where a course key object was being passed in to `get_proctoring_escalation_email`,
rather than a string.

[3.7.13] - 2021-03-16
~~~~~~~~~~~~~~~~~~~~~
* Update proctored exam error message to remove statement that the user must restart their exam
Expand Down
2 changes: 1 addition & 1 deletion edx_proctoring/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"""

# Be sure to update the version number in edx_proctoring/package.json
__version__ = '3.7.13'
__version__ = '3.7.14'

default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name
2 changes: 1 addition & 1 deletion edx_proctoring/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -2140,7 +2140,7 @@ def _get_proctored_exam_context(exam, attempt, user_id, course_id, is_practice_e
) if attempt else '',
'link_urls': settings.PROCTORING_SETTINGS.get('LINK_URLS', {}),
'tech_support_email': settings.TECH_SUPPORT_EMAIL,
'proctoring_escalation_email': _get_proctoring_escalation_email(course_id),
'proctoring_escalation_email': _get_proctoring_escalation_email(exam['course_id']),
'exam_review_policy': _get_review_policy_by_exam_id(exam['id']),
'backend_js_bundle': provider.get_javascript(),
'provider_tech_support_email': provider.tech_support_email,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@edx/edx-proctoring",
"//": "Be sure to update the version number in edx_proctoring/__init__.py",
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
"version": "3.7.13",
"version": "3.7.14",
"main": "edx_proctoring/static/index.js",
"scripts":{
"test":"gulp test"
Expand Down

0 comments on commit 3c10294

Please sign in to comment.