Skip to content

remove 'preview' from urls in enrollment emails sent while previewing a ... #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adampalay merged 1 commit into from
Aug 13, 2013
Merged

remove 'preview' from urls in enrollment emails sent while previewing a ... #649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions lms/djangoapps/instructor/views/legacy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,13 +1119,14 @@ def _do_enroll_students(course, course_id, students, overload=False, auto_enroll
ceaset.delete()

if email_students:
registration_url = 'https://' + settings.SITE_NAME + reverse('student.views.register_user')
stripped_site_name = _remove_preview(settings.SITE_NAME)
registration_url = 'https://' + stripped_site_name + reverse('student.views.register_user')
#Composition of email
d = {'site_name': settings.SITE_NAME,
d = {'site_name': stripped_site_name,
'registration_url': registration_url,
'course_id': course_id,
'auto_enroll': auto_enroll,
'course_url': 'https://' + settings.SITE_NAME + '/courses/' + course_id,
'course_url': 'https://' + stripped_site_name + '/courses/' + course_id,
}

for student in new_students:
Expand Down Expand Up @@ -1209,9 +1210,10 @@ def _do_unenroll_students(course_id, students, email_students=False):
old_students, _ = get_and_clean_student_list(students)
status = dict([x, 'unprocessed'] for x in old_students)

stripped_site_name = _remove_preview(settings.SITE_NAME)
if email_students:
#Composition of email
d = {'site_name': settings.SITE_NAME,
d = {'site_name': stripped_site_name,
'course_id': course_id}

for student in old_students:
Expand Down Expand Up @@ -1301,6 +1303,12 @@ def send_mail_to_student(student, param_dict):
return False


def _remove_preview(site_name):
if site_name[:8] == "preview.":
return site_name[8:]
return site_name


def get_and_clean_student_list(students):
"""
Separate out individual student email from the comma, or space separated string.
Expand Down