From b8c1dba1cba892a863bb84b4249b193a1711cbe1 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 29 Jan 2013 17:31:12 -0500
Subject: [PATCH 1/3] Catch save error and throw it in the user's face (bug
 147). May need to add catches in more places or put in $.ajaxSetup?

---
 cms/static/js/views/settings/main_settings_view.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js
index 9037d4510c..704623b56e 100644
--- a/cms/static/js/views/settings/main_settings_view.js
+++ b/cms/static/js/views/settings/main_settings_view.js
@@ -55,7 +55,10 @@ CMS.Views.ValidatingView = Backbone.View.extend({
 		var newVal = $(event.currentTarget).val();
 		if (currentVal != newVal) {
 			this.clearValidationErrors();
-			this.model.save(field, newVal);
+			this.model.save(field, newVal, { error : function(model, error) {
+				// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+				if (error.responseText) window.alert("Error: " + error.responseText);
+			}});
 			return true;
 		}
 		else return false;

From ab4fd03dd8c5b42afcaa0258e27d51245d613671 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Wed, 30 Jan 2013 09:43:27 -0500
Subject: [PATCH 2/3] Catch any and all save errors

---
 .../js/models/settings/course_details.js      | 12 +++++-
 .../js/views/settings/main_settings_view.js   | 38 +++++++++++++++----
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js
index ab80179142..61e31133fd 100644
--- a/cms/static/js/models/settings/course_details.js
+++ b/cms/static/js/models/settings/course_details.js
@@ -68,10 +68,18 @@ CMS.Models.Settings.CourseDetails = Backbone.Model.extend({
 	save_videosource: function(newsource) {
 		// newsource either is <video youtube="speed:key, *"/> or just the "speed:key, *" string
 		// returns the videosource for the preview which iss the key whose speed is closest to 1
-		if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.save({'intro_video': null}); 
+		if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.save({'intro_video': null},
+				{ error : function(model, error) {
+					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+					window.alert("Error during save: " + error.responseText);
+				}}); 
 		// TODO remove all whitespace w/in string
 		else {
-			if (this.get('intro_video') !== newsource) this.save('intro_video', newsource);
+			if (this.get('intro_video') !== newsource) this.save('intro_video', newsource,
+					{ error : function(model, error) {
+						// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+						window.alert("Error during save: " + error.responseText);
+					}});
 		}
 		
 		return this.videosourceSample();
diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js
index 704623b56e..602da60ed6 100644
--- a/cms/static/js/views/settings/main_settings_view.js
+++ b/cms/static/js/views/settings/main_settings_view.js
@@ -57,7 +57,7 @@ CMS.Views.ValidatingView = Backbone.View.extend({
 			this.clearValidationErrors();
 			this.model.save(field, newVal, { error : function(model, error) {
 				// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-				if (error.responseText) window.alert("Error: " + error.responseText);
+				window.alert("Error during save: " + error.responseText);
 			}});
 			return true;
 		}
@@ -230,7 +230,11 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
                     time = 0;
                 }
                 var newVal = new Date(date.getTime() + time * 1000);
-                if (cacheModel.get(fieldName) != newVal) cacheModel.save(fieldName, newVal);
+                if (cacheModel.get(fieldName) != newVal) cacheModel.save(fieldName, newVal,
+                		{ error : function(model, error) {
+            				// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+            				window.alert("Error during save: " + error.responseText);
+            			}});
             }
 		};
 		
@@ -279,7 +283,11 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 	},
 	
 	removeSyllabus: function() {
-		if (this.model.has('syllabus'))	this.model.save({'syllabus': null});
+		if (this.model.has('syllabus'))	this.model.save({'syllabus': null}, 
+				{ error : function(model, error) {
+					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+					window.alert("Error during save: " + error.responseText);
+				}});
 	},
 	
 	assetSyllabus : function() {
@@ -312,7 +320,11 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 					mirror.save();
 					cachethis.clearValidationErrors();
 					var newVal = mirror.getValue();
-					if (cachethis.model.get(field) != newVal) cachethis.model.save(field, newVal);
+					if (cachethis.model.get(field) != newVal) cachethis.model.save(field, newVal,
+							{ error : function(model, error) {
+								// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+								window.alert("Error during save: " + error.responseText);
+							}});
 				}
 			});
 		}
@@ -407,7 +419,11 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 	setGracePeriod : function(event) {
 		event.data.clearValidationErrors();
 		var newVal = event.data.model.dateToGracePeriod($(event.currentTarget).timepicker('getTime'));
-		if (event.data.model.get('grace_period') != newVal) event.data.model.save('grace_period', newVal);
+		if (event.data.model.get('grace_period') != newVal) event.data.model.save('grace_period', newVal,
+				{ error : function(model, error) {
+					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+					window.alert("Error during save: " + error.responseText);
+				}});
 	},
 	updateModel : function(event) {
 		if (!this.selectorToField[event.currentTarget.id]) return;
@@ -543,7 +559,11 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 					object[cutoff['designation']] = cutoff['cutoff'] / 100.0;
 					return object;
 				}, 
-				{}));
+				{}),
+				{ error : function(model, error) {
+					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+					window.alert("Error during save: " + error.responseText);
+				}});
 	},
 	
 	addNewGrade: function(e) {
@@ -674,7 +694,11 @@ CMS.Views.Settings.GraderView = CMS.Views.ValidatingView.extend({
 		}
 	},
 	deleteModel : function(e) {
-		this.model.destroy();
+		this.model.destroy(
+				{ error : function(model, error) {
+					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
+					window.alert("Error during save: " + error.responseText);
+				}});
 		e.preventDefault();
 	}
 	

From 19927a83a5ac3301cc5a9570f7f864f0ec46afed Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Wed, 30 Jan 2013 11:24:55 -0500
Subject: [PATCH 3/3] Ensure settings and course info CRUD operations tell the
 user if there's a server error and pull the server error handler into a
 common function.

---
 .../js/models/settings/course_details.js      | 10 ++----
 cms/static/js/views/course_info_edit.js       | 16 ++++-----
 cms/static/js/views/server_error.js           |  4 +++
 .../js/views/settings/main_settings_view.js   | 35 ++++---------------
 cms/templates/course_info.html                |  1 +
 cms/templates/settings.html                   |  1 +
 6 files changed, 23 insertions(+), 44 deletions(-)
 create mode 100644 cms/static/js/views/server_error.js

diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js
index 61e31133fd..bdbb46b3b1 100644
--- a/cms/static/js/models/settings/course_details.js
+++ b/cms/static/js/models/settings/course_details.js
@@ -69,17 +69,11 @@ CMS.Models.Settings.CourseDetails = Backbone.Model.extend({
 		// newsource either is <video youtube="speed:key, *"/> or just the "speed:key, *" string
 		// returns the videosource for the preview which iss the key whose speed is closest to 1
 		if (_.isEmpty(newsource) && !_.isEmpty(this.get('intro_video'))) this.save({'intro_video': null},
-				{ error : function(model, error) {
-					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-					window.alert("Error during save: " + error.responseText);
-				}}); 
+				{ error : CMS.ServerError}); 
 		// TODO remove all whitespace w/in string
 		else {
 			if (this.get('intro_video') !== newsource) this.save('intro_video', newsource,
-					{ error : function(model, error) {
-						// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-						window.alert("Error during save: " + error.responseText);
-					}});
+					{ error : CMS.ServerError});
 		}
 		
 		return this.videosourceSample();
diff --git a/cms/static/js/views/course_info_edit.js b/cms/static/js/views/course_info_edit.js
index 0ad02215db..cb396b2a7f 100644
--- a/cms/static/js/views/course_info_edit.js
+++ b/cms/static/js/views/course_info_edit.js
@@ -99,10 +99,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         var targetModel = this.eventModel(event);
         targetModel.set({ date : this.dateEntry(event).val(), content : this.$codeMirror.getValue() });
         // push change to display, hide the editor, submit the change        
-        targetModel.save({}, {error : function(model, xhr) {
-        	// TODO use a standard component
-        	window.alert(xhr.responseText);
-        }});
+        targetModel.save({}, {error : CMS.ServerError});
         this.closeEditor(this);
     },
     
@@ -145,8 +142,10 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({
         this.modelDom(event).remove();
         var cacheThis = this;
         targetModel.destroy({success : function (model, response) { 
-            cacheThis.collection.fetch({success : function() {cacheThis.render();}});
-        }
+            cacheThis.collection.fetch({success : function() {cacheThis.render();},
+                error : CMS.ServerError});
+        },
+        error : CMS.ServerError
         });
     },
 
@@ -225,7 +224,8 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
                             self.render();                
                         }
                     );
-                }
+                },
+                error : CMS.ServerError
             }
         );
     },
@@ -267,7 +267,7 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({
     onSave: function(event) {
         this.model.set('data', this.$codeMirror.getValue());
         this.render();
-        this.model.save();
+        this.model.save({}, {error: CMS.ServerError});
         this.$form.hide();
         this.closeEditor(this);
     },
diff --git a/cms/static/js/views/server_error.js b/cms/static/js/views/server_error.js
new file mode 100644
index 0000000000..11478b5712
--- /dev/null
+++ b/cms/static/js/views/server_error.js
@@ -0,0 +1,4 @@
+CMS.ServerError = function(model, error) {
+	// this handler is for the client:server communication not the validation errors which handleValidationError catches
+	window.alert("Server Error: " + error.responseText);
+};
\ No newline at end of file
diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js
index 602da60ed6..e2b5326aaf 100644
--- a/cms/static/js/views/settings/main_settings_view.js
+++ b/cms/static/js/views/settings/main_settings_view.js
@@ -55,10 +55,7 @@ CMS.Views.ValidatingView = Backbone.View.extend({
 		var newVal = $(event.currentTarget).val();
 		if (currentVal != newVal) {
 			this.clearValidationErrors();
-			this.model.save(field, newVal, { error : function(model, error) {
-				// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-				window.alert("Error during save: " + error.responseText);
-			}});
+			this.model.save(field, newVal, { error : CMS.ServerError});
 			return true;
 		}
 		else return false;
@@ -231,10 +228,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
                 }
                 var newVal = new Date(date.getTime() + time * 1000);
                 if (cacheModel.get(fieldName) != newVal) cacheModel.save(fieldName, newVal,
-                		{ error : function(model, error) {
-            				// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-            				window.alert("Error during save: " + error.responseText);
-            			}});
+                		{ error : CMS.ServerError});
             }
 		};
 		
@@ -284,10 +278,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 	
 	removeSyllabus: function() {
 		if (this.model.has('syllabus'))	this.model.save({'syllabus': null}, 
-				{ error : function(model, error) {
-					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-					window.alert("Error during save: " + error.responseText);
-				}});
+				{ error : CMS.ServerError});
 	},
 	
 	assetSyllabus : function() {
@@ -321,10 +312,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
 					cachethis.clearValidationErrors();
 					var newVal = mirror.getValue();
 					if (cachethis.model.get(field) != newVal) cachethis.model.save(field, newVal,
-							{ error : function(model, error) {
-								// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-								window.alert("Error during save: " + error.responseText);
-							}});
+							{ error : CMS.ServerError});
 				}
 			});
 		}
@@ -420,10 +408,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 		event.data.clearValidationErrors();
 		var newVal = event.data.model.dateToGracePeriod($(event.currentTarget).timepicker('getTime'));
 		if (event.data.model.get('grace_period') != newVal) event.data.model.save('grace_period', newVal,
-				{ error : function(model, error) {
-					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-					window.alert("Error during save: " + error.responseText);
-				}});
+				{ error : CMS.ServerError});
 	},
 	updateModel : function(event) {
 		if (!this.selectorToField[event.currentTarget.id]) return;
@@ -560,10 +545,7 @@ CMS.Views.Settings.Grading = CMS.Views.ValidatingView.extend({
 					return object;
 				}, 
 				{}),
-				{ error : function(model, error) {
-					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-					window.alert("Error during save: " + error.responseText);
-				}});
+				{ error : CMS.ServerError});
 	},
 	
 	addNewGrade: function(e) {
@@ -695,10 +677,7 @@ CMS.Views.Settings.GraderView = CMS.Views.ValidatingView.extend({
 	},
 	deleteModel : function(e) {
 		this.model.destroy(
-				{ error : function(model, error) {
-					// this handler is for the client:server communication not the vlidation errors which handleValidationError catches
-					window.alert("Error during save: " + error.responseText);
-				}});
+				{ error : CMS.ServerError});
 		e.preventDefault();
 	}
 	
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html
index f4fa661b6e..83d829efa0 100644
--- a/cms/templates/course_info.html
+++ b/cms/templates/course_info.html
@@ -10,6 +10,7 @@
   <script type="text/javascript" src="${static.url('js/models/course_info.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/module_info.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/course_info_edit.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
   <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
   <script src="${static.url('js/vendor/timepicker/datepair.js')}"></script>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 1fa5b0acce..8cd4246da9 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -20,6 +20,7 @@ from contentstore import utils
   <script type="text/javascript" src="${static.url('js/models/settings/course_settings.js')}"></script>
   <script type="text/javascript" src="${static.url('js/models/settings/course_grading_policy.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/settings/main_settings_view.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/views/server_error.js')}"></script>
   
   <script type="text/javascript">
     $(document).ready(function(){