Merge pull request #6137 from edx/renzo/missing-checkbox-absent-preference

Refrain from setting email opt-in preference when checkbox is missing

common/djangoapps/student/tests/test_enrollment.py

@@ -110,10 +110,13 @@ class EnrollmentTest(ModuleStoreTestCase):
     @ddt.data(
         ([], 'true'),
         ([], 'false'),
+        ([], None),
         (['honor', 'verified'], 'true'),
         (['honor', 'verified'], 'false'),
+        (['honor', 'verified'], None),
         (['professional'], 'true'),
         (['professional'], 'false'),
+        (['professional'], None),
     )
     @ddt.unpack
     def test_enroll_with_email_opt_in(self, course_modes, email_opt_in, mock_update_email_opt_in):
@@ -129,8 +132,11 @@ class EnrollmentTest(ModuleStoreTestCase):
         self._change_enrollment('enroll', email_opt_in=email_opt_in)
 
         # Verify that the profile API has been called as expected
-        opt_in = email_opt_in == 'true'
-        mock_update_email_opt_in.assert_called_once_with(self.USERNAME, self.course.org, opt_in)
+        if email_opt_in is not None:
+            opt_in = email_opt_in == 'true'
+            mock_update_email_opt_in.assert_called_once_with(self.USERNAME, self.course.org, opt_in)
+        else:
+            self.assertFalse(mock_update_email_opt_in.called)
 
     def test_user_not_authenticated(self):
         # Log out, so we're no longer authenticated

common/djangoapps/student/views.py

@@ -776,8 +776,10 @@ def try_change_enrollment(request):
 
 def _update_email_opt_in(request, username, org):
     """Helper function used to hit the profile API if email opt-in is enabled."""
-    email_opt_in = request.POST.get('email_opt_in') == 'true'
-    profile_api.update_email_opt_in(username, org, email_opt_in)
+    email_opt_in = request.POST.get('email_opt_in')
+    if email_opt_in is not None:
+        email_opt_in_boolean = email_opt_in == 'true'
+        profile_api.update_email_opt_in(username, org, email_opt_in_boolean)
 
 
 @require_POST

lms/templates/courseware/mktg_course_about.html

@@ -11,19 +11,30 @@
 
 <%block name="bodyclass">view-iframe-content view-partial-mktgregister</%block>
 
-
 <%block name="js_extra">
   <script type="text/javascript">
   (function() {
     $(".register").click(function(event) {
-      if ( !$("#email-opt-in").prop("checked") ) {
-        $("input[name='email_opt_in']").val("false");
-      }
+      var el = $("input[name='email_opt_in']"),
+        emailOptIn,
+        currentHref;
+
+      // Check if the email opt-in checkbox is missing
+      if ( $("#email-opt-in").length == 0 ) {
+        // Remove the corresponding hidden form element
+        el.remove();
+      } else {
+        // Check if the email opt-in checkbox is not checked
+        if ( !$("#email-opt-in").prop("checked") ) {
+          // Set the value of the corresponding hidden form element
+          el.val("false");
+        }
 
-      var email_opt_in = $("input[name='email_opt_in']").val(),
-        current_href = $("a.register").attr("href");
-      if (current_href) {
-        $("a.register").attr("href", current_href + "&email_opt_in=" + email_opt_in)
+        emailOptIn = el.val();
+        currentHref = $("a.register").attr("href");
+        if (currentHref) {
+          $("a.register").attr("href", currentHref + "&email_opt_in=" + emailOptIn);
+        }
       }
 
       $("#class_enroll_form").submit();
@@ -31,6 +42,8 @@
     });
 
     $('#class_enroll_form').on('ajax:complete', function(event, xhr) {
+      var emailOptIn = '';
+
       if(xhr.status == 200) {
         if (xhr.responseText != "") {
           window.top.location.href = xhr.responseText;
@@ -39,13 +52,14 @@
           window.top.location.href = "${reverse('dashboard')}";
         }
       } else if (xhr.status == 403) {
-        var email_opt_in = $("input[name='email_opt_in']").val();
+        // Check if the email opt-in checkbox is present
+        if ( $("#email-opt-in").length != 0 ) {
+          emailOptIn = '&email_opt_in=' + $("input[name='email_opt_in']").val();
+        }
+
+        <% href_url = 'accounts_login' if settings.FEATURES.get("ENABLE_COMBINED_LOGIN_REGISTRATION") else 'register_user' %>
         ## Ugh.
-        % if settings.FEATURES.get("ENABLE_COMBINED_LOGIN_REGISTRATION"):
-        window.top.location.href = $("a.register").attr("href") || "${reverse('accounts_login')}?course_id=${course.id | u}&enrollment_action=enroll&email_opt_in=" + email_opt_in;
-        % else:
-        window.top.location.href = $("a.register").attr("href") || "${reverse('register_user')}?course_id=${course.id | u}&enrollment_action=enroll&email_opt_in=" + email_opt_in;
-        % endif
+        window.top.location.href = $("a.register").attr("href") || "${reverse(href_url)}?course_id=${course.id | u}&enrollment_action=enroll" + emailOptIn;
       } else {
         $('#register_error').html(
             (xhr.responseText ? xhr.responseText : "${_("An error occurred. Please try again later.")}")
@@ -70,11 +84,8 @@
         %elif allow_registration:
         <a class="action action-register register ${'has-option-verified' if len(course_modes) > 1 else ''}"
             %if not user.is_authenticated():
-                % if settings.FEATURES.get("ENABLE_COMBINED_LOGIN_REGISTRATION"):
-                href="${reverse('accounts_login')}?course_id=${course.id | u}&enrollment_action=enroll"
-                % else:
-                href="${reverse('register_user')}?course_id=${course.id | u}&enrollment_action=enroll"
-                % endif
+              <% href_url = 'accounts_login' if settings.FEATURES.get("ENABLE_COMBINED_LOGIN_REGISTRATION") else 'register_user' %>
+              href="${reverse(href_url)}?course_id=${course.id | u}&enrollment_action=enroll"
             %endif
         >${_("Enroll in")} <strong>${course.display_number_with_default | h}</strong>
             %if len(course_modes) > 1: