Commit 71455f76 by Don Mitchell

Check for null dates before setting time in timepicker.

Remove syllabus as it's not instrumented.
parent cd23c8f8
...@@ -220,7 +220,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({ ...@@ -220,7 +220,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
timefield.on('changeTime', savefield); timefield.on('changeTime', savefield);
datefield.datepicker('setDate', this.model.get(fieldName)); 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) { updateModel: function(event) {
...@@ -352,7 +352,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({ ...@@ -352,7 +352,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
var graceEle = this.$el.find('#course-grading-graceperiod'); var graceEle = this.$el.find('#course-grading-graceperiod');
graceEle.timepicker({'timeFormat' : 'H:i'}); // init doesn't take setTime 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; return this;
}, },
......
...@@ -180,7 +180,7 @@ from contentstore import utils ...@@ -180,7 +180,7 @@ from contentstore import utils
</div> </div>
</div> </div>
<div class="row row-col2"> <!-- <div class="row row-col2">
<label for="course-syllabus">Course Syllabus</label> <label for="course-syllabus">Course Syllabus</label>
<div class="field"> <div class="field">
<div class="input input-existing"> <div class="input input-existing">
...@@ -198,7 +198,7 @@ from contentstore import utils ...@@ -198,7 +198,7 @@ from contentstore import utils
<span class="tip tip-inline">PDF formatting preferred</span> <span class="tip tip-inline">PDF formatting preferred</span>
</div> </div>
</div> </div>
</div> </div> -->
</section><!-- .settings-details-schedule --> </section><!-- .settings-details-schedule -->
<hr class="divide" /> <hr class="divide" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment