Commit 3c51b9ab by chrisndodge

Merge pull request #144 from edx/release

Release
parents 42894358 50aa9505
......@@ -701,7 +701,7 @@ def send_proctoring_attempt_status_email(exam_attempt_obj, course_name):
'exam_name': exam_attempt_obj.proctored_exam.exam_name,
'status': ProctoredExamStudentAttemptStatus.get_status_alias(exam_attempt_obj.status),
'platform': constants.PLATFORM_NAME,
'contact_email': constants.CONTACT_EMAIL
'contact_email': constants.CONTACT_EMAIL,
})
)
......@@ -712,12 +712,14 @@ def send_proctoring_attempt_status_email(exam_attempt_obj, course_name):
)
)
EmailMessage(
email = EmailMessage(
body=body,
from_email=constants.FROM_EMAIL,
to=[exam_attempt_obj.user.email],
subject=subject
).send()
)
email.content_subtype = "html"
email.send()
def remove_exam_attempt(attempt_id):
......
......@@ -19,7 +19,8 @@ FROM_EMAIL = (
'STATUS_EMAIL_FROM_ADDRESS' in settings.PROCTORING_SETTINGS else settings.DEFAULT_FROM_EMAIL
)
# Note that CONTACT_EMAIL is not defined in Studio runtimes
CONTACT_EMAIL = (
settings.PROCTORING_SETTINGS['CONTACT_EMAIL'] if
'CONTACT_EMAIL' in settings.PROCTORING_SETTINGS else settings.CONTACT_EMAIL
'CONTACT_EMAIL' in settings.PROCTORING_SETTINGS else getattr(settings, 'CONTACT_EMAIL', FROM_EMAIL)
)
"""
We need python think this is a python module
"""
......@@ -34,7 +34,7 @@ def load_requirements(*requirements_paths):
setup(
name='edx-proctoring',
version='0.7.2',
version='0.8.3',
description='Proctoring subsystem for Open edX',
long_description=open('README.md').read(),
author='edX',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment