diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-08-13 13:23:56 -0400 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-08-13 13:23:56 -0400 |
commit | 8fc4456213c5ee16863b7f1bcb20e35a19469a1d (patch) | |
tree | fa33fc50e8380e3a08b49ea11d1450b5f1bb9d15 /web/react/components | |
parent | ca919538cc402ed90ce42ffc3ef98994bb1081f4 (diff) | |
download | chat-8fc4456213c5ee16863b7f1bcb20e35a19469a1d.tar.gz chat-8fc4456213c5ee16863b7f1bcb20e35a19469a1d.tar.bz2 chat-8fc4456213c5ee16863b7f1bcb20e35a19469a1d.zip |
Removed isEmailEnabledSynchronous and switched the email disabled warnings to use ConfigStore
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/invite_member_modal.jsx | 3 | ||||
-rw-r--r-- | web/react/components/signup_team_complete.jsx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx index fb3d46b0a..ef63465c8 100644 --- a/web/react/components/invite_member_modal.jsx +++ b/web/react/components/invite_member_modal.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. var utils = require('../utils/utils.jsx'); +var ConfigStore = require('../stores/config_store.jsx'); var Client = require('../utils/client.jsx'); var UserStore = require('../stores/user_store.jsx'); var ConfirmModal = require('./confirm_modal.jsx'); @@ -152,7 +153,7 @@ module.exports = React.createClass({ emailErrors: {}, firstNameErrors: {}, lastNameErrors: {}, - emailEnabled: Client.isEmailEnabledSynchronous() + emailEnabled: !ConfigStore.getSettingAsBoolean('ByPassEmail', false) }; }, render: function() { diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index ee690f692..e27fcd19d 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -2,6 +2,7 @@ // See License.txt for license information. var utils = require('../utils/utils.jsx'); +var ConfigStore = require('../stores/config_store.jsx'); var client = require('../utils/client.jsx'); var UserStore = require('../stores/user_store.jsx'); var BrowserStore = require('../stores/browser_store.jsx'); @@ -500,7 +501,7 @@ SendInivtesPage = React.createClass({ }, getInitialState: function() { return { - emailEnabled: client.isEmailEnabledSynchronous() + emailEnabled: !ConfigStore.getSettingAsBoolean('ByPassEmail', false) }; }, render: function() { |