Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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-platform
Commits
650c9131
Commit
650c9131
authored
Oct 09, 2013
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1260 from edx/sarina/email_FROM_address
Change the default FROM address for bulk email
parents
e2075476
c9172b79
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
lms/djangoapps/bulk_email/tasks.py
+10
-1
lms/envs/common.py
+1
-1
No files found.
lms/djangoapps/bulk_email/tasks.py
View file @
650c9131
...
...
@@ -142,7 +142,16 @@ def _send_course_email(email_id, to_list, course_title, course_url, image_url, t
subject
=
"["
+
course_title
+
"] "
+
msg
.
subject
course_title_no_quotes
=
re
.
sub
(
r'"'
,
''
,
course_title
)
from_addr
=
'"{0}" Course Staff <{1}>'
.
format
(
course_title_no_quotes
,
settings
.
DEFAULT_BULK_FROM_EMAIL
)
course_num
=
msg
.
course_id
.
split
(
'/'
)[
1
]
# course_id = 'org/course_num/run'
# Substitute a '_' anywhere a non-(ascii, period, or dash) character appears.
INVALID_CHARS
=
re
.
compile
(
r"[^\w.-]"
)
course_num
=
INVALID_CHARS
.
sub
(
'_'
,
course_num
)
# Make a unique from name and address for each course, eg
# "COURSE_TITLE" Course Staff <coursenum-no-reply@courseupdates.edx.org>
from_addr
=
'"{0}" Course Staff <{1}-{2}>'
.
format
(
course_title_no_quotes
,
course_num
,
settings
.
DEFAULT_BULK_FROM_EMAIL
)
course_email_template
=
CourseEmailTemplate
.
get_template
()
...
...
lms/envs/common.py
View file @
650c9131
...
...
@@ -428,7 +428,7 @@ IGNORABLE_404_ENDS = ('favicon.ico')
# Email
EMAIL_BACKEND
=
'django.core.mail.backends.console.EmailBackend'
DEFAULT_FROM_EMAIL
=
'registration@edx.org'
DEFAULT_BULK_FROM_EMAIL
=
'
course-updates@
edx.org'
DEFAULT_BULK_FROM_EMAIL
=
'
no-reply@courseupdates.
edx.org'
EMAILS_PER_TASK
=
100
EMAILS_PER_QUERY
=
1000
DEFAULT_FEEDBACK_EMAIL
=
'feedback@edx.org'
...
...
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