summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/system_users/system_users_list.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-08-04 13:51:08 -0400
committerSaturnino Abril <saturnino.abril@gmail.com>2017-08-05 01:51:08 +0800
commit5a8c1c18e52c4604e1b8473fb3ab57c670e9858f (patch)
tree7806eb63883f6fca58b350642bdd15441b9e2112 /webapp/components/admin_console/system_users/system_users_list.jsx
parent28726460d76d942f4d9995e417168c687310034f (diff)
downloadchat-5a8c1c18e52c4604e1b8473fb3ab57c670e9858f.tar.gz
chat-5a8c1c18e52c4604e1b8473fb3ab57c670e9858f.tar.bz2
chat-5a8c1c18e52c4604e1b8473fb3ab57c670e9858f.zip
PLT-7287 Move access token text in user list to under the dropdown (#7099)
* Move access token text in user list to under the dropdown * Updating UI for token help text (#7107)
Diffstat (limited to 'webapp/components/admin_console/system_users/system_users_list.jsx')
-rw-r--r--webapp/components/admin_console/system_users/system_users_list.jsx30
1 files changed, 0 insertions, 30 deletions
diff --git a/webapp/components/admin_console/system_users/system_users_list.jsx b/webapp/components/admin_console/system_users/system_users_list.jsx
index 2863f9cec..8a7f30e1b 100644
--- a/webapp/components/admin_console/system_users/system_users_list.jsx
+++ b/webapp/components/admin_console/system_users/system_users_list.jsx
@@ -16,7 +16,6 @@ const dispatch = store.dispatch;
const getState = store.getState;
import {getUser} from 'mattermost-redux/actions/users';
-import * as UserUtils from 'mattermost-redux/utils/user_utils';
import {Constants} from 'utils/constants.jsx';
import * as Utils from 'utils/utils.jsx';
@@ -196,35 +195,6 @@ export default class SystemUsersList extends React.Component {
}
}
- const userAccessTokensEnabled = global.window.mm_config.EnableUserAccessTokens === 'true';
- if (userAccessTokensEnabled) {
- const hasPostAllRole = UserUtils.hasPostAllRole(user.roles);
- const hasPostAllPublicRole = UserUtils.hasPostAllPublicRole(user.roles);
- const hasUserAccessTokenRole = UserUtils.hasUserAccessTokenRole(user.roles);
- const isSystemAdmin = UserUtils.isSystemAdmin(user.roles);
-
- let messageId = 'admin.user_item.userAccessTokenNo';
- if (hasUserAccessTokenRole || isSystemAdmin) {
- if (isSystemAdmin) {
- messageId = 'admin.user_item.userAccessTokenAdmin';
- } else if (hasPostAllRole) {
- messageId = 'admin.user_item.userAccessTokenPostAll';
- } else if (hasPostAllPublicRole) {
- messageId = 'admin.user_item.userAccessTokenPostAllPublic';
- } else {
- messageId = 'admin.user_item.userAccessTokenYes';
- }
- }
-
- info.push(', ');
- info.push(
- <FormattedHTMLMessage
- key='admin.user_item.userAccessToken'
- id={messageId}
- />
- );
- }
-
return info;
}