Hide "Email Settings" from student dash if bulk email not enabled

Some minor pep8 cleanup

common/lib/html_to_text.py

@@ -4,6 +4,7 @@ from subprocess import Popen, PIPE
 
 log = logging.getLogger(__name__)
 
+
 def html_to_text(html_message):
     """
     Converts an html message to plaintext.

lms/djangoapps/bulk_email/tests/test_err_handling.py

@@ -40,7 +40,6 @@ class TestEmailErrors(ModuleStoreTestCase):
 
         self.url = reverse('instructor_dashboard', kwargs={'course_id': self.course.id})
 
-
     def tearDown(self):
         self.smtp_server_thread.stop()
         patch.stopall()

lms/djangoapps/bulk_email/tests/tests.py

 """
 Unit tests for email feature flag in instructor dashboard
+and student dashboard. Additionally tests that bulk email
+is always disabled for non-Mongo backed courses, regardless
+of email feature flag.
 """
 
 from django.test.utils import override_settings
@@ -7,7 +10,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
-from student.tests.factories import AdminFactory
+from student.tests.factories import AdminFactory, UserFactory, CourseEnrollmentFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore import XML_MODULESTORE_TYPE
@@ -78,3 +81,63 @@ class TestInstructorDashboardEmailView(ModuleStoreTestCase):
             # Assert that the URL for the email view is not in the response
             response = self.client.get(self.url)
             self.assertFalse(self.email_link in response.content)
+
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
+class TestStudentDashboardEmailView(ModuleStoreTestCase):
+    """
+    Check for email view displayed with flag
+    """
+    def setUp(self):
+        self.course = CourseFactory.create()
+
+        # Create student account
+        student = UserFactory.create()
+        CourseEnrollmentFactory.create(user=student, course_id=self.course.id)
+        self.client.login(username=student.username, password="test")
+
+        # URL for dashboard
+        self.url = reverse('dashboard')
+        # URL for email settings modal
+        self.email_modal_link = '<a href="#email-settings-modal" class="email-settings" rel="leanModal" data-course-id="{0}/{1}/{2}" data-course-number="{1}" data-optout="False">Email Settings</a>'.format(
+            self.course.org,
+            self.course.number,
+            self.course.display_name.replace(' ', '_')
+            )
+
+
+    def tearDown(self):
+        """
+        Undo all patches.
+        """
+        patch.stopall()
+
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True})
+    def test_email_flag_true(self):
+        # Assert that the URL for the email view is in the response
+        response = self.client.get(self.url)
+        self.assertTrue(self.email_modal_link in response.content)
+
+
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': False})
+    def test_email_flag_false(self):
+        # Assert that the URL for the email view is not in the response
+        response = self.client.get(self.url)
+        self.assertFalse(self.email_modal_link in response.content)
+
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True})
+    def test_email_flag_true_xml_store(self):
+        # If the enable email setting is enabled, but this is an XML backed course,
+        # the email view shouldn't be available on the instructor dashboard.
+
+        # The course factory uses a MongoModuleStore backing, so patch the
+        # `get_modulestore_type` method to pretend to be XML-backed.
+        # This is OK; we're simply testing that the `is_mongo_modulestore_type` flag
+        # in `instructor/views/legacy.py` is doing the correct thing.
+
+        with patch('xmodule.modulestore.mongo.base.MongoModuleStore.get_modulestore_type') as mock_modulestore:
+            mock_modulestore.return_value = XML_MODULESTORE_TYPE
+
+            # Assert that the URL for the email view is not in the response
+            response = self.client.get(self.url)
+            self.assertFalse(self.email_modal_link in response.content)

lms/djangoapps/instructor/views/legacy.py

@@ -721,7 +721,6 @@ def instructor_dashboard(request, course_id):
         course_url = request.build_absolute_uri(reverse('course_root', kwargs={'course_id': course_id}))
         tasks.delegate_email_batches.delay(email.id, email.to_option, course_id, course_url, request.user.id)
 
-
         if to_option == "all":
             email_msg = '<div class="msg msg-confirm"><p class="copy">Your email was successfully queued for sending. Please note that for large public classes (~10k), it may take 1-2 hours to send all emails.</p></div>'
         else:

lms/templates/dashboard.html

@@ -5,6 +5,8 @@
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
   from certificates.models import CertificateStatuses
+  from xmodule.modulestore import MONGO_MODULESTORE_TYPE
+  from xmodule.modulestore.django import modulestore
 %>
 <%inherit file="main.html" />
 
@@ -306,7 +308,10 @@
               % endif
             % endif
             <a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">${_('Unregister')}</a>
-            <a href="#email-settings-modal" class="email-settings" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}" data-optout="${course.id in course_optouts}">${_('Email Settings')}</a>
+	    % if settings.MITX_FEATURES['ENABLE_INSTRUCTOR_EMAIL'] and modulestore().get_modulestore_type(course.id) == MONGO_MODULESTORE_TYPE:
+	      <!-- Only show the Email Settings link/modal if this course has bulk email feature enabled -->
+              <a href="#email-settings-modal" class="email-settings" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}" data-optout="${course.id in course_optouts}">${_('Email Settings')}</a>
+	    % endif
           </section>
         </article>