diff options
author | Corey Hulen <corey@hulen.com> | 2015-06-25 11:42:25 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-06-25 11:42:25 -0400 |
commit | 49baf739187ba7984bbd7dce0f458bf23223703e (patch) | |
tree | 54db51c5cd4d2bd6c7bbd6ec8b489b87bbaeca03 | |
parent | d146916f3937100a8fa4778514a167b5842dbaf9 (diff) | |
parent | 9b9b6bd2b7b8df92fe907915e4d80986492b7fd1 (diff) | |
download | chat-49baf739187ba7984bbd7dce0f458bf23223703e.tar.gz chat-49baf739187ba7984bbd7dce0f458bf23223703e.tar.bz2 chat-49baf739187ba7984bbd7dce0f458bf23223703e.zip |
Merge pull request #45 from rgarmsen2295/mm-1309
MM-1309
-rw-r--r-- | web/react/components/signup_team_complete.jsx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 99dcf6f5f..30fe92af5 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -324,7 +324,7 @@ EmailItem = React.createClass({ getValue: function() { return this.refs.email.getDOMNode().value.trim() }, - validate: function() { + validate: function(teamEmail) { var email = this.refs.email.getDOMNode().value.trim().toLowerCase(); if (!email) { @@ -336,6 +336,11 @@ EmailItem = React.createClass({ this.setState(this.state); return false; } + else if (email === teamEmail) { + this.state.email_error = "Please use an a different email than the one used at signup"; + this.setState(this.state); + return false; + } else { this.state.email_error = ""; this.setState(this.state); @@ -375,7 +380,7 @@ SendInivtesPage = React.createClass({ var emails = []; for (var i = 0; i < this.props.state.invites.length; i++) { - if (!this.refs['email_' + i].validate()) { + if (!this.refs['email_' + i].validate(this.props.state.team.email)) { valid = false; } else { emails.push(this.refs['email_' + i].getValue()); |