diff options
| author | enahum <nahumhbl@gmail.com> | 2016-08-30 23:05:23 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-08-30 22:05:23 -0400 |
| commit | db660bdf9cbea09197d8292a8ec8efda8ac41f38 (patch) | |
| tree | 00845d6b588c0b149dc56a90b1c7ef9abfc9b9ff /webapp/components/navbar_dropdown.jsx | |
| parent | 1326ab66a141e73f1ef7d9d39bb86596f56179e0 (diff) | |
| download | chat-db660bdf9cbea09197d8292a8ec8efda8ac41f38.tar.gz chat-db660bdf9cbea09197d8292a8ec8efda8ac41f38.tar.bz2 chat-db660bdf9cbea09197d8292a8ec8efda8ac41f38.zip | |
PLT-4007 Fix OAuth: Javascript error when team admin accesses the OAuth 2.0 menu (#3887)
Diffstat (limited to 'webapp/components/navbar_dropdown.jsx')
| -rw-r--r-- | webapp/components/navbar_dropdown.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx index 39bd6b159..719ec74d9 100644 --- a/webapp/components/navbar_dropdown.jsx +++ b/webapp/components/navbar_dropdown.jsx @@ -205,7 +205,7 @@ export default class NavbarDropdown extends React.Component { config.EnableIncomingWebhooks === 'true' || config.EnableOutgoingWebhooks === 'true' || config.EnableCommands === 'true' || - config.EnableOAuthServiceProvider === 'true'; + (config.EnableOAuthServiceProvider === 'true' && (isSystemAdmin || config.EnableOnlyAdminIntegrations !== 'true')); if (integrationsEnabled && (isAdmin || config.EnableOnlyAdminIntegrations !== 'true')) { integrationsLink = ( <li> |