From 71455f760e1b63caa97fe42970b6c0006c83b8dd Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Wed, 12 Dec 2012 11:37:04 -0500
Subject: [PATCH] Check for null dates before setting time in timepicker.
 Remove syllabus as it's not instrumented.

---
 cms/static/js/views/settings/main_settings_view.js | 4 ++--
 cms/templates/settings.html                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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
                 </div>
               </div>
 
-              <div class="row row-col2">
+              <!-- <div class="row row-col2">
                 <label for="course-syllabus">Course Syllabus</label>
                 <div class="field">
                   <div class="input input-existing">
@@ -198,7 +198,7 @@ from contentstore import utils
                     <span class="tip tip-inline">PDF formatting preferred</span>          
                   </div>
                 </div>
-              </div>
+              </div> -->
             </section><!-- .settings-details-schedule -->
 
             <hr class="divide" />