From 05010b6b33482f1b726cd8302185cc801ad1d008 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 30 Jun 2015 11:39:17 -0700 Subject: [PATCH 1/2] Add HTTP error codes to ajax-error --- app/assets/javascripts/discourse/lib/ajax-error.js.es6 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 index b7a8f24c6f..0b4700a273 100644 --- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 +++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 @@ -36,6 +36,12 @@ function extractError(error) { } } + if (!parsedError) { + if (error.status && error.status >= 400) { + parsedError = error.status + " " + error.statusText; + } + } + return parsedError || I18n.t('generic_error'); } From 130d6a3a2689e08e440c800be05c73f251ceedb4 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 30 Jun 2015 11:40:24 -0700 Subject: [PATCH 2/2] Join together all errors if mulitple --- app/assets/javascripts/discourse/lib/ajax-error.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 index 0b4700a273..04d6d0dbc7 100644 --- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 +++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 @@ -28,7 +28,7 @@ function extractError(error) { if (parsedJSON) { if (parsedJSON.errors && parsedJSON.errors.length > 0) { - parsedError = parsedJSON.errors[0]; + parsedError = parsedJSON.errors.join("
"); } else if (parsedJSON.error) { parsedError = parsedJSON.error; } else if (parsedJSON.failed) {