diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-07-26 12:39:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 12:39:35 -0400 |
| commit | 528890dba01d6835754c78bf7695621c828b6838 (patch) | |
| tree | 2870cab02f121a69021aa1e9f2cde1a7287f4d05 /webapp/components | |
| parent | 00291c652ed7dba4649d50243bbde1633722d3df (diff) | |
| download | chat-528890dba01d6835754c78bf7695621c828b6838.tar.gz chat-528890dba01d6835754c78bf7695621c828b6838.tar.bz2 chat-528890dba01d6835754c78bf7695621c828b6838.zip | |
Changing LDAP behavour so users disabled in LDAP server are disabled in Mattermost. (#3669)
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/admin_console/user_item.jsx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx index 3743c075d..b4e74057f 100644 --- a/webapp/components/admin_console/user_item.jsx +++ b/webapp/components/admin_console/user_item.jsx @@ -260,6 +260,11 @@ export default class UserItem extends React.Component { showMakeNotActive = false; } + let disableActivationToggle = false; + if (user.auth_service === Constants.LDAP_SERVICE) { + disableActivationToggle = true; + } + let makeSystemAdmin = null; if (showMakeSystemAdmin) { makeSystemAdmin = ( @@ -332,10 +337,18 @@ export default class UserItem extends React.Component { ); } + let menuClass = ''; + if (disableActivationToggle) { + menuClass = 'disabled'; + } + let makeActive = null; if (showMakeActive) { makeActive = ( - <li role='presentation'> + <li + role='presentation' + className={menuClass} + > <a role='menuitem' href='#' @@ -353,7 +366,10 @@ export default class UserItem extends React.Component { let makeNotActive = null; if (showMakeNotActive) { makeNotActive = ( - <li role='presentation'> + <li + role='presentation' + className={menuClass} + > <a role='menuitem' href='#' |