diff options
author | azul <azul@riseup.net> | 2017-03-23 15:44:06 +0000 |
---|---|---|
committer | azul <azul@riseup.net> | 2017-03-23 15:44:06 +0000 |
commit | 9beeee8aa2d1656e7c80e54137156e7922737aa5 (patch) | |
tree | aa72458db14d1afbf06c89e40f4c28c6477015c4 /app/assets/javascripts/users.js | |
parent | ca92c307d0c02ee56d3ff22661511d8386d1af8f (diff) | |
parent | c11e31acf3a592b8560459469ae4acf0e6e5dfd4 (diff) |
Merge branch 'fix/display-js-error-responses' into 'master'
fix: display error js responses in dev environment
See merge request !30
github issue #231
Diffstat (limited to 'app/assets/javascripts/users.js')
-rw-r--r-- | app/assets/javascripts/users.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js index 3dae526..4b5198f 100644 --- a/app/assets/javascripts/users.js +++ b/app/assets/javascripts/users.js @@ -151,11 +151,11 @@ } function extractErrors(message) { - if ($.isPlainObject(message) && message.errors) { - return message.errors; + if ($.isPlainObject(message)) { + return message.errors || { base: message.error }; } else { return { - base: (message.error || JSON.stringify(message)) + base: message }; } } |