diff --git a/ghost/admin/views/base.js b/ghost/admin/views/base.js index 3046f0d256..e7a19cb99b 100644 --- a/ghost/admin/views/base.js +++ b/ghost/admin/views/base.js @@ -96,7 +96,14 @@ if (request.status !== 200) { try { // Try to parse out the error, or default to "Unknown" - message = request.responseJSON.error || "Unknown Error"; + if (request.responseJSON.errors && _.isArray(request.responseJSON.errors)) { + message = ''; + _.each(request.responseJSON.errors, function (errorItem) { + message += '
' + errorItem.message; + }); + } else { + message = request.responseJSON.error || "Unknown Error"; + } } catch (e) { msgDetail = request.status ? request.status + " - " + request.statusText : "Server was not available"; message = "The server returned an error (" + msgDetail + ")."; diff --git a/ghost/admin/views/debug.js b/ghost/admin/views/debug.js index e3333a15d4..bf4f63fbed 100644 --- a/ghost/admin/views/debug.js +++ b/ghost/admin/views/debug.js @@ -53,7 +53,7 @@ error: function (response) { $('#startupload').text('Import'); var responseJSON = response.responseJSON, - message = responseJSON && responseJSON.error ? responseJSON.error : 'unknown'; + message = responseJSON && responseJSON.errors[0].message ? responseJSON.errors[0].message : 'unknown'; Ghost.notifications.addItem({ type: 'error', message: ['A problem was encountered while importing new content to your blog. Error: ', message].join(''), @@ -123,7 +123,7 @@ }, error: function onError(response) { var responseText = JSON.parse(response.responseText), - message = responseText && responseText.error ? responseText.error : 'unknown'; + message = responseText && responseText.errors[0].message ? responseText.errors[0].message : 'unknown'; Ghost.notifications.addItem({ type: 'error', message: ['A problem was encountered while deleting content from your blog. Error: ', message].join(''), @@ -175,7 +175,7 @@ }, error: function onError(response) { var responseText = JSON.parse(response.responseText), - message = responseText && responseText.error ? responseText.error : 'unknown'; + message = responseText && responseText.errors[0].message ? responseText.errors[0].message : 'unknown'; Ghost.notifications.addItem({ type: 'error', message: ['A problem was encountered while sending the test email: ', message].join(''),