summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings.jsx
diff options
context:
space:
mode:
authornickago <ngonella@calpoly.edu>2015-07-29 10:45:33 -0700
committernickago <ngonella@calpoly.edu>2015-07-29 10:45:33 -0700
commit7cdd91687c0e163dd867a11fb56fd7fbac9879d2 (patch)
tree01a6ea495a5b9ead1e633ccfb059d6f6598563ea /web/react/components/user_settings.jsx
parenta07ab924d32a6a2258539f53ba2875afa1e070bf (diff)
downloadchat-7cdd91687c0e163dd867a11fb56fd7fbac9879d2.tar.gz
chat-7cdd91687c0e163dd867a11fb56fd7fbac9879d2.tar.bz2
chat-7cdd91687c0e163dd867a11fb56fd7fbac9879d2.zip
Added error safety and a unique message for duplicate emails
Diffstat (limited to 'web/react/components/user_settings.jsx')
-rw-r--r--web/react/components/user_settings.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 47772a26b..e7ac08a94 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -709,7 +709,11 @@ var GeneralTab = React.createClass({
}.bind(this),
function(err) {
state = this.getInitialState();
- state.server_error = err.message;
+ if(err.message) {
+ state.server_error = err.message;
+ } else {
+ state.server_error = err
+ }
this.setState(state);
}.bind(this)
);