diff options
author | Corey Hulen <corey@hulen.com> | 2015-10-26 12:10:10 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-10-26 12:10:10 -0700 |
commit | 86e3764cbd544c64136d5c34c2b80fb66a0cd4bd (patch) | |
tree | 60b7314ee05b996c60160e490c1dfcc73dc1d8fc /web/react/components | |
parent | 2680b81568ca3f8eac1d5937f85085f1785eb84d (diff) | |
parent | 9635bfdd4f3925b0f6f0873508216824b604ac10 (diff) | |
download | chat-86e3764cbd544c64136d5c34c2b80fb66a0cd4bd.tar.gz chat-86e3764cbd544c64136d5c34c2b80fb66a0cd4bd.tar.bz2 chat-86e3764cbd544c64136d5c34c2b80fb66a0cd4bd.zip |
Merge pull request #1193 from hmhealey/plt798
PLT-798 Prevent image files larger than 4k resolution from being uploaded
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/create_post.jsx | 10 | ||||
-rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index b74f1871c..32ee31efe 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -253,8 +253,14 @@ export default class CreatePost extends React.Component { this.setState({uploadsInProgress: draft.uploadsInProgress, previews: draft.previews}); } handleUploadError(err, clientId) { + let message = err; + if (message && typeof message !== 'string') { + // err is an AppError from the server + message = err.message; + } + if (clientId === -1) { - this.setState({serverError: err}); + this.setState({serverError: message}); } else { const draft = PostStore.getDraft(this.state.channelId); @@ -265,7 +271,7 @@ export default class CreatePost extends React.Component { PostStore.storeDraft(this.state.channelId, draft); - this.setState({uploadsInProgress: draft.uploadsInProgress, serverError: err}); + this.setState({uploadsInProgress: draft.uploadsInProgress, serverError: message}); } } handleTextDrop(text) { 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) ); |