TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-28 05:14:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #763 from sebgie/issue#600

Browse Source 
Improve error message
This commit is contained in:
Hannah Wolfe 2013-09-16 01:32:53 -07:00
commit 59b471c798
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghost/admin/views/base.js
View File

@ -81,7 +81,8 @@
// Used in API request fail handlers to parse a standard api error // Used in API request fail handlers to parse a standard api error
// response json for the message to display // response json for the message to display
getRequestErrorMessage: function (request) { getRequestErrorMessage: function (request) {
var message; var message,
msgDetail;
// Can't really continue without a request // Can't really continue without a request
if (!request) { if (!request) {
@ -97,7 +98,8 @@
// Try to parse out the error, or default to "Unknown" // Try to parse out the error, or default to "Unknown"
message = request.responseJSON.error || "Unknown Error"; message = request.responseJSON.error || "Unknown Error";
} catch (e) { } catch (e) {
message = "The server returned an error (" + (request.status || "?") + ")."; msgDetail = request.status ? request.status + " - " + request.statusText : "Server was not available";
message = "The server returned an error (" + msgDetail + ").";
} }
} }