Add "Auto Enroll" option for bulk beta add

lms/djangoapps/instructor/tests/test_api.py

@@ -702,9 +702,16 @@ class TestInstructorAPIBulkBetaEnrollment(ModuleStoreTestCase, LoginEnrollmentTe
         response = self.client.get(url, {'emails': self.beta_tester.email, 'action': action})
         self.assertEqual(response.status_code, 400)
 
-    def add_notenrolled(self, url, response, identifier):
-        self.assertEqual(response.status_code, 200)
+    def add_notenrolled(self, response, identifier):
+        """
+        Takes a client response from a call to bulk_beta_modify_access with 'email_students': False,
+        and the student identifier (email or username) given as 'emails' in the request.
 
+        Asserts the reponse returns cleanly, that the student was added as a beta tester, and the
+        response properly contains their identifier, 'error': False, and 'userDoesNotExist': False.
+        Additionally asserts no email was sent.
+        """
+        self.assertEqual(response.status_code, 200)
         self.assertTrue(CourseBetaTesterRole(self.course.location).has_user(self.notenrolled_student))
         # test the response data
         expected = {
@@ -727,12 +734,26 @@ class TestInstructorAPIBulkBetaEnrollment(ModuleStoreTestCase, LoginEnrollmentTe
     def test_add_notenrolled_email(self):
         url = reverse('bulk_beta_modify_access', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {'emails': self.notenrolled_student.email, 'action': 'add', 'email_students': False})
-        self.add_notenrolled(url, response, self.notenrolled_student.email)
+        self.add_notenrolled(response, self.notenrolled_student.email)
+        self.assertFalse(CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id))
+
+    def test_add_notenrolled_email_autoenroll(self):
+        url = reverse('bulk_beta_modify_access', kwargs={'course_id': self.course.id})
+        response = self.client.get(url, {'emails': self.notenrolled_student.email, 'action': 'add', 'email_students': False, 'auto_enroll': True})
+        self.add_notenrolled(response, self.notenrolled_student.email)
+        self.assertTrue(CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id))
 
     def test_add_notenrolled_username(self):
         url = reverse('bulk_beta_modify_access', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {'emails': self.notenrolled_student.username, 'action': 'add', 'email_students': False})
-        self.add_notenrolled(url, response, self.notenrolled_student.username)
+        self.add_notenrolled(response, self.notenrolled_student.username)
+        self.assertFalse(CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id))
+
+    def test_add_notenrolled_username_autoenroll(self):
+        url = reverse('bulk_beta_modify_access', kwargs={'course_id': self.course.id})
+        response = self.client.get(url, {'emails': self.notenrolled_student.username, 'action': 'add', 'email_students': False, 'auto_enroll': True})
+        self.add_notenrolled(response, self.notenrolled_student.username)
+        self.assertTrue(CourseEnrollment.is_enrolled(self.notenrolled_student, self.course.id))
 
     def test_add_notenrolled_with_email(self):
         url = reverse('bulk_beta_modify_access', kwargs={'course_id': self.course.id})

lms/djangoapps/instructor/views/api.py

@@ -33,7 +33,7 @@ from django_comment_common.models import (
 )
 
 from courseware.models import StudentModule
-from student.models import unique_id_for_user
+from student.models import unique_id_for_user, CourseEnrollment
 import instructor_task.api
 from instructor_task.api_helper import AlreadyRunningError
 from instructor_task.views import get_task_completion_info
@@ -322,6 +322,7 @@ def bulk_beta_modify_access(request, course_id):
     emails_raw = request.GET.get('emails')
     emails = _split_input_list(emails_raw)
     email_students = request.GET.get('email_students') in ['true', 'True', True]
+    auto_enroll = request.GET.get('auto_enroll') in ['true', 'True', True]
     results = []
     rolename = 'beta'
     course = get_course_by_id(course_id)
@@ -357,6 +358,12 @@ def bulk_beta_modify_access(request, course_id):
             # If no exception thrown, see if we should send an email
             if email_students:
                 send_beta_role_email(action, user, email_params)
+            # See if we should autoenroll the student
+            if auto_enroll:
+                # Check if student is already enrolled
+                if not CourseEnrollment.is_enrolled(user, course_id):
+                    CourseEnrollment.enroll(user, course_id)
+
         finally:
             # Tabulate the action result of this email address
             results.append({

lms/static/coffee/src/instructor_dashboard/membership.coffee

@@ -181,16 +181,19 @@ class BetaTesterBulkAddition
     @$emails_input           = @$container.find("textarea[name='student-emails-for-beta']")
     @$btn_beta_testers       = @$container.find("input[name='beta-testers']")
     @$checkbox_emailstudents = @$container.find("input[name='email-students']")
+    @$checkbox_autoenroll    = @$container.find("input[name='auto-enroll']")
     @$task_response          = @$container.find(".request-response")
     @$request_response_error = @$container.find(".request-response-error")
 
     # click handlers
     @$btn_beta_testers.click =>
       emailStudents = @$checkbox_emailstudents.is(':checked')
+      autoEnroll = @$checkbox_autoenroll.is(':checked')
       send_data = 
         action: $(event.target).data('action')  # 'add' or 'remove'
         emails: @$emails_input.val()
         email_students: emailStudents
+        auto_enroll: autoEnroll
 
       $.ajax
         dataType: 'json'
@@ -219,8 +222,6 @@ class BetaTesterBulkAddition
       else
         successes.push student_results
 
-    console.log(sr.email for sr in successes)
-
     render_list = (label, emails) =>
       task_res_section = $ '<div/>', class: 'request-res-section'
       task_res_section.append $ '<h3/>', text: label

lms/static/sass/course/instructor/_instructor_2.scss

@@ -358,6 +358,11 @@ section.instructor-dashboard-content-2 {
     display: block;
   }
 
+  label[for="auto-enroll-beta"]:hover + .auto-enroll-beta-hint {
+    width: 30%;
+    display: block;
+  }
+
 
   label[for="email-students"]:hover + .email-students-hint {
     display: block;

lms/templates/instructor/instructor_dashboard_2/membership.html

@@ -81,6 +81,19 @@
   </p>
 
   <div class="enroll-option">
+    <input type="checkbox" name="auto-enroll" value="Auto-Enroll" checked="yes">
+    <label for="auto-enroll-beta">${_("Auto Enroll")}</label>
+    <div class="hint auto-enroll-beta-hint">
+      <span class="hint-caret"></span>
+      <p>
+	${_("If this option is <em>checked</em>, users who have not enrolled in your course will be automatically enrolled.").format(platform_name=settings.PLATFORM_NAME)}
+	<br /><br />
+	${_("Checking this box has no effect if 'Remove beta testers' is selected.")}
+      </p>
+    </div>
+  </div>
+
+  <div class="enroll-option">
     <input type="checkbox" name="email-students" value="Notify-students-by-email" checked="yes">
     <label for="email-students-beta">${_("Notify users by email")}</label>
     <div class="hint email-students-beta-hint">