web client: combine validation error message setting functions

1 files changed, 13 insertions, 18 deletions

diff --git a/web/client.js b/web/client.js
index 2e5c86e..1e425c8 100644
--- a/web/client.js
+++ b/web/client.js
@@ -278,22 +278,7 @@ $(function() {
 				    options = {type: "DELETE"}
 				else options = {
 				    type: "PUT",
-				    data: JSON.stringify(newValue),
-				    statusCode: {
-					422: function(xhr) {
-					    msg.html(_.reduce(
-						_.map(
-						    $.parseJSON(
-							xhr.responseText
-						    ),
-						    _.escape
-						),
-						function(a, b) {
-						    return a + "<br/>" + b;
-						}
-					    ));
-					}
-				    }
+				    data: JSON.stringify(newValue)
 				}
 				var task = objRequest(path, options);
 
@@ -328,9 +313,19 @@ $(function() {
 					);
 
 				}).fail(function(xhr) {
-				    showError(msg, "Error", xhr);
-				    widget.setStatus("invalid");
+				    if (xhr.statusCode().status == 422)
+					msg.html(_.reduce(
+					    _.map(
+						$.parseJSON(xhr.responseText),
+						_.escape
+					    ),
+					    function(a, b) {
+						return a + "<br/>" + b;
+					    }
+					));
+				    else showError(msg, "Error", xhr);
 
+				    widget.setStatus("invalid");
 				    setStatus(
 					"invalid",
 					"Some values need checking",