summaryrefslogtreecommitdiffstats
path: root/web/react/components/invite_member_modal.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-07-09 21:00:29 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-07-09 21:00:29 +0500
commitb61f653626df4183ddf2f3d26a4dd955436f15de (patch)
tree2c274b5f5c112f49ca175fe053a2743bbb75218f /web/react/components/invite_member_modal.jsx
parenta533ff4d71cd6416d959ae970cded679242ba3e8 (diff)
parentb6fb6ea3be059d3c54027267760ccca0f95535ee (diff)
downloadchat-b61f653626df4183ddf2f3d26a4dd955436f15de.tar.gz
chat-b61f653626df4183ddf2f3d26a4dd955436f15de.tar.bz2
chat-b61f653626df4183ddf2f3d26a4dd955436f15de.zip
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'web/react/components/invite_member_modal.jsx')
-rw-r--r--web/react/components/invite_member_modal.jsx7
1 files changed, 6 insertions, 1 deletions
diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx
index d1672126d..9ff67ae1b 100644
--- a/web/react/components/invite_member_modal.jsx
+++ b/web/react/components/invite_member_modal.jsx
@@ -89,7 +89,12 @@ module.exports = React.createClass({
$(this.refs.modal.getDOMNode()).modal('hide');
}.bind(this),
function(err) {
- this.setState({ server_error: err });
+ if (err.message === "This person is already on your team") {
+ email_errors[err.detailed_error] = err.message;
+ this.setState({ email_errors: email_errors });
+ }
+ else
+ this.setState({ server_error: err.message});
}.bind(this)
);