diff options
author | Corey Hulen <corey@hulen.com> | 2015-06-25 11:42:11 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-06-25 11:42:11 -0400 |
commit | d146916f3937100a8fa4778514a167b5842dbaf9 (patch) | |
tree | 61694158acd6595f3dc0c10dfd7a333d3f223066 /web | |
parent | d9dfb2cbd1051af178f58f509dcfe8b106abb1a5 (diff) | |
parent | e9d7844a9cd4675697a9729e6964ad6c1e8b43d9 (diff) | |
download | chat-d146916f3937100a8fa4778514a167b5842dbaf9.tar.gz chat-d146916f3937100a8fa4778514a167b5842dbaf9.tar.bz2 chat-d146916f3937100a8fa4778514a167b5842dbaf9.zip |
Merge pull request #43 from rgarmsen2295/mm-1202
MM-1202
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/invite_member_modal.jsx | 4 | ||||
-rw-r--r-- | web/static/config/config.js | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx index 1854107f8..d1672126d 100644 --- a/web/react/components/invite_member_modal.jsx +++ b/web/react/components/invite_member_modal.jsx @@ -57,7 +57,7 @@ module.exports = React.createClass({ if (config.AllowInviteNames) { invite.first_name = this.refs["first_name"+index].getDOMNode().value.trim(); - if (!invite.first_name ) { + if (!invite.first_name && config.RequireInviteNames) { first_name_errors[index] = "This is a required field"; valid = false; } else { @@ -65,7 +65,7 @@ module.exports = React.createClass({ } invite.last_name = this.refs["last_name"+index].getDOMNode().value.trim(); - if (!invite.last_name ) { + if (!invite.last_name && config.RequireInviteNames) { last_name_errors[index] = "This is a required field"; valid = false; } else { diff --git a/web/static/config/config.js b/web/static/config/config.js index 82d4bbf70..45c713da2 100644 --- a/web/static/config/config.js +++ b/web/static/config/config.js @@ -13,6 +13,7 @@ var config = { // Feature switches AllowPublicLink: true, AllowInviteNames: true, + RequireInviteNames: false, AllowSignupDomainsWizard: false, // Privacy switches |