Merge branch 'master' of https://github.com/mattermost/platform

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)
         );