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
OpenEdx
edx-proctoring
Commits
3c51b9ab
Commit
3c51b9ab
authored
Sep 09, 2015
by
chrisndodge
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #144 from edx/release
Release
parents
42894358
50aa9505
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
edx_proctoring/api.py
+5
-3
edx_proctoring/constants.py
+2
-1
edx_proctoring/templates/emails/__init__.py
+3
-0
setup.py
+1
-1
No files found.
edx_proctoring/api.py
View file @
3c51b9ab
...
...
@@ -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
):
...
...
edx_proctoring/constants.py
View file @
3c51b9ab
...
...
@@ -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
)
)
edx_proctoring/templates/emails/__init__.py
0 → 100644
View file @
3c51b9ab
"""
We need python think this is a python module
"""
setup.py
View file @
3c51b9ab
...
...
@@ -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'
,
...
...
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