summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings/user_settings_general.jsx
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-10-26 14:15:07 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-10-26 14:45:13 -0400
commitff6e91f51d844a4703d3c4648b8b6bffe0cdabbc (patch)
tree0f6c2d250b671c15429966233289a9d19756f005 /web/react/components/user_settings/user_settings_general.jsx
parentb46c01b2903d49903cfcf6588097cb72d599b391 (diff)
downloadchat-ff6e91f51d844a4703d3c4648b8b6bffe0cdabbc.tar.gz
chat-ff6e91f51d844a4703d3c4648b8b6bffe0cdabbc.tar.bz2
chat-ff6e91f51d844a4703d3c4648b8b6bffe0cdabbc.zip
Fixed file upload and profile picture upload error display to work for serverside errors
Diffstat (limited to 'web/react/components/user_settings/user_settings_general.jsx')
-rw-r--r--web/react/components/user_settings/user_settings_general.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index 70e559c30..1c8ce3c79 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -171,7 +171,7 @@ export default class UserSettingsGeneralTab extends React.Component {
}.bind(this),
function imageUploadFailure(err) {
var state = this.setupInitialState(this.props);
- state.serverError = err;
+ state.serverError = err.message;
this.setState(state);
}.bind(this)
);