Merge pull request #35675 from mitodl/anas/fix-certificate-display-ba…

…haviour fix: certificate display behavior not showing date-picker for end-with-date
openedx · Oct 30, 2024 · 3dbb993 · 3dbb993
2 parents 5cba2b7 + fb5e269
commit 3dbb993
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 34 deletions.
diff --git a/cms/static/js/factories/settings.js b/cms/static/js/factories/settings.js
@@ -3,7 +3,7 @@ define([
 ], function($, CourseDetailsModel, MainView) {
     'use strict';
 
-    return function(detailsUrl, showMinGradeWarning, showCertificateAvailableDate, upgradeDeadline, useV2CertDisplaySettings) {
+    return function(detailsUrl, showMinGradeWarning, showCertificateAvailableDate, upgradeDeadline) {
         var model;
         // highlighting labels when fields are focused in
         $('form :input')
@@ -23,7 +23,6 @@ define([
         model = new CourseDetailsModel();
         model.urlRoot = detailsUrl;
         model.showCertificateAvailableDate = showCertificateAvailableDate;
-        model.useV2CertDisplaySettings = useV2CertDisplaySettings;
         model.set('upgrade_deadline', upgradeDeadline);
         model.fetch({
             // eslint-disable-next-line no-shadow
@@ -33,7 +32,6 @@ define([
                     model: model,
                     showMinGradeWarning: showMinGradeWarning
                 });
-                editor.useV2CertDisplaySettings = useV2CertDisplaySettings;
                 editor.render();
             },
             reset: true,

diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js
@@ -84,35 +84,33 @@ function(Backbone, _, gettext, ValidationHelpers, DateUtils, StringUtils) {
                 );
             }
 
-            if (this.useV2CertDisplaySettings) {
-                if (
-                    newattrs.certificates_display_behavior
-                        && !(Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).includes(newattrs.certificates_display_behavior))
-                ) {
-                    errors.certificates_display_behavior = StringUtils.interpolate(
-                        gettext(
-                            'The certificate display behavior must be one of: {behavior_options}'
-                        ),
-                        {
-                            behavior_options: Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).join(', ')
-                        }
-                    );
-                }
+            if (
+                newattrs.certificates_display_behavior
+                    && !(Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).includes(newattrs.certificates_display_behavior))
+            ) {
+                errors.certificates_display_behavior = StringUtils.interpolate(
+                    gettext(
+                        'The certificate display behavior must be one of: {behavior_options}'
+                    ),
+                    {
+                        behavior_options: Object.values(CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS).join(', ')
+                    }
+                );
+            }
 
-                // Throw error if there's a value for certificate_available_date
-                if (
-                    (newattrs.certificate_available_date && newattrs.certificates_display_behavior != CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
-                        || (!newattrs.certificate_available_date && newattrs.certificates_display_behavior == CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
-                ) {
-                    errors.certificates_display_behavior = StringUtils.interpolate(
-                        gettext(
-                            'The certificates display behavior must be {valid_option} if certificate available date is set.'
-                        ),
-                        {
-                            valid_option: CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE
-                        }
-                    );
-                }
+            // Throw error if there's a value for certificate_available_date
+            if (
+                (newattrs.certificate_available_date && newattrs.certificates_display_behavior != CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
+                    || (!newattrs.certificate_available_date && newattrs.certificates_display_behavior == CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE)
+            ) {
+                errors.certificates_display_behavior = StringUtils.interpolate(
+                    gettext(
+                        'The certificates display behavior must be {valid_option} if certificate available date is set.'
+                    ),
+                    {
+                        valid_option: CERTIFICATES_DISPLAY_BEHAVIOR_OPTIONS.END_WITH_DATE
+                    }
+                );
             }
 
             if (newattrs.intro_video && newattrs.intro_video !== this.get('intro_video')) {

diff --git a/cms/static/js/views/settings/main.js b/cms/static/js/views/settings/main.js
@@ -388,9 +388,6 @@ function(ValidatingView, CodeMirror, _, $, ui, DateUtils, FileUploadModel,
                     Hides and clears the certificate available date field if a display behavior that doesn't use it is
                     chosen. Because we are clearing it, toggling back to "end_with_date" will require re-entering the date
                     */
-            if (!this.useV2CertDisplaySettings) {
-                return;
-            }
             // eslint-disable-next-line prefer-const
             let showDatepicker = this.model.get('certificates_display_behavior') == 'end_with_date';
             // eslint-disable-next-line prefer-const