From 431eb8f4e7896d0aac32fc63bb1aba519def304c Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Mon, 12 Aug 2013 14:03:27 -0400 Subject: [PATCH] remove 'preview' from urls in enrollment emails sent while previewing a course --- lms/djangoapps/instructor/views/legacy.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py index 6a02b5be7d..42f399c143 100644 --- a/lms/djangoapps/instructor/views/legacy.py +++ b/lms/djangoapps/instructor/views/legacy.py @@ -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: @@ -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: @@ -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.