From b185a686d8198ec8173c0cce5e4e054e20d5a72a Mon Sep 17 00:00:00 2001
From: muzaffaryousaf <muzaffar.yousaf@arbisoft.com>
Date: Tue, 9 Jun 2015 18:48:55 +0500
Subject: [PATCH] Removing course_title from email subject.

TNL-1877
---
 lms/djangoapps/bulk_email/tasks.py            |  3 +--
 lms/djangoapps/bulk_email/tests/test_email.py | 10 ++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py
index d88b08a9d0..96fe7528b0 100644
--- a/lms/djangoapps/bulk_email/tasks.py
+++ b/lms/djangoapps/bulk_email/tasks.py
@@ -475,7 +475,6 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas
         subtask_status.increment(skipped=num_optout)
 
     course_title = global_email_context['course_title']
-    subject = "[" + course_title + "] " + course_email.subject
 
     # use the email from address in the CourseEmail, if it is present, otherwise compute it
     from_addr = course_email.from_addr if course_email.from_addr else \
@@ -511,7 +510,7 @@ def _send_course_email(entry_id, email_id, to_list, global_email_context, subtas
 
             # Create email:
             email_msg = EmailMultiAlternatives(
-                subject,
+                course_email.subject,
                 plaintext_msg,
                 from_addr,
                 [email],
diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py
index 3732d72d48..9a85bd2ba5 100644
--- a/lms/djangoapps/bulk_email/tests/test_email.py
+++ b/lms/djangoapps/bulk_email/tests/test_email.py
@@ -129,10 +129,7 @@ class TestEmailSendFromDashboardMockedHtmlToText(EmailSendFromDashboardTestCase)
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(len(mail.outbox[0].to), 1)
         self.assertEquals(mail.outbox[0].to[0], self.instructor.email)
-        self.assertEquals(
-            mail.outbox[0].subject,
-            '[' + self.course.display_name + ']' + ' test subject for myself'
-        )
+        self.assertEquals(mail.outbox[0].subject, 'test subject for myself')
 
     def test_send_to_staff(self):
         """
@@ -240,10 +237,7 @@ class TestEmailSendFromDashboardMockedHtmlToText(EmailSendFromDashboardTestCase)
             [e.to[0] for e in mail.outbox],
             [self.instructor.email] + [s.email for s in self.staff] + [s.email for s in self.students]
         )
-        self.assertEquals(
-            mail.outbox[0].subject,
-            '[' + self.course.display_name + '] ' + uni_subject
-        )
+        self.assertEquals(mail.outbox[0].subject, uni_subject)
 
     def test_unicode_students_send_to_all(self):
         """