diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js index 210b99d7c6..db347bae82 100644 --- a/cms/static/js/views/settings/main_settings_view.js +++ b/cms/static/js/views/settings/main_settings_view.js @@ -220,7 +220,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({ timefield.on('changeTime', savefield); datefield.datepicker('setDate', this.model.get(fieldName)); - timefield.timepicker('setTime', this.model.get(fieldName)); + if (this.model.has(fieldName)) timefield.timepicker('setTime', this.model.get(fieldName)); }, updateModel: function(event) { @@ -352,7 +352,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({ var graceEle = this.$el.find('#course-grading-graceperiod'); graceEle.timepicker({'timeFormat' : 'H:i'}); // init doesn't take setTime - graceEle.timepicker('setTime', this.model.gracePeriodToDate()); + if (this.model.has('grace_period')) graceEle.timepicker('setTime', this.model.gracePeriodToDate()); return this; }, diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 8681fe80d1..559df38cf4 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -180,7 +180,7 @@ from contentstore import utils -
+