diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-30 08:49:36 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-30 08:49:36 -0400 |
| commit | 4646c22ef185234a12937f7f3a5e036e5779417f (patch) | |
| tree | b55d5a476ba8477ed8192712d45b992762603e9c /web | |
| parent | b2b6bddadc6331d0f183f10da556b34f46314f73 (diff) | |
| parent | 7cdd91687c0e163dd867a11fb56fd7fbac9879d2 (diff) | |
| download | chat-4646c22ef185234a12937f7f3a5e036e5779417f.tar.gz chat-4646c22ef185234a12937f7f3a5e036e5779417f.tar.bz2 chat-4646c22ef185234a12937f7f3a5e036e5779417f.zip | |
Merge pull request #281 from nickago/MM-1600
MM-1600 Improve quality of error returned upon a duplicate username request
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/user_settings.jsx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index e1ae6da52..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; + if(err.message) { + state.server_error = err.message; + } else { + state.server_error = err + } this.setState(state); }.bind(this) ); |