diff options
author | doh5 <doo@mattermost.com> | 2017-05-17 22:19:17 +0900 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-17 09:19:17 -0400 |
commit | f13b2ffbe1c92fce1f031db7ecee2477d0e69621 (patch) | |
tree | d113eeef834e0bdd7107d8d7acd0e12cb706a3d7 /webapp/components/user_list_row.jsx | |
parent | 128eab2de4376e2b2a822d8ebd4774d5aa6a2119 (diff) | |
download | chat-f13b2ffbe1c92fce1f031db7ecee2477d0e69621.tar.gz chat-f13b2ffbe1c92fce1f031db7ecee2477d0e69621.tar.bz2 chat-f13b2ffbe1c92fce1f031db7ecee2477d0e69621.zip |
Add IDs to the system console user list, its name and email (#6419)
* Update system_users.jsx
* Update user_list.jsx
* Update user_list.jsx
* Update user_list.jsx
* Update user_list_row.jsx
* Update user_list_row.jsx
Diffstat (limited to 'webapp/components/user_list_row.jsx')
-rw-r--r-- | webapp/components/user_list_row.jsx | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/webapp/components/user_list_row.jsx b/webapp/components/user_list_row.jsx index 3a7fc5d1c..1f5eacd48 100644 --- a/webapp/components/user_list_row.jsx +++ b/webapp/components/user_list_row.jsx @@ -13,7 +13,7 @@ import Client from 'client/web_client.jsx'; import React from 'react'; import {FormattedHTMLMessage} from 'react-intl'; -export default function UserListRow({user, extraInfo, actions, actionProps, actionUserProps}) { +export default function UserListRow({user, extraInfo, actions, actionProps, actionUserProps, userCount}) { const nameFormat = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', ''); let name = user.username; @@ -58,6 +58,13 @@ export default function UserListRow({user, extraInfo, actions, actionProps, acti status = UserStore.getStatus(user.id); } + let userCountID = null; + let userCountEmail = null; + if (userCount >= 0) { + userCountID = Utils.createSafeId('userListRowName' + userCount); + userCountEmail = Utils.createSafeId('userListRowEmail' + userCount); + } + return ( <div key={user.id} @@ -72,10 +79,16 @@ export default function UserListRow({user, extraInfo, actions, actionProps, acti <div className='more-modal__details' > - <div className='more-modal__name'> + <div + id={userCountID} + className='more-modal__name' + > {name} </div> - <div className={emailStyle}> + <div + id={userCountEmail} + className={emailStyle} + > {email} </div> {extraInfo} @@ -101,5 +114,6 @@ UserListRow.propTypes = { extraInfo: React.PropTypes.arrayOf(React.PropTypes.object), actions: React.PropTypes.arrayOf(React.PropTypes.func), actionProps: React.PropTypes.object, - actionUserProps: React.PropTypes.object + actionUserProps: React.PropTypes.object, + userCount: React.PropTypes.number }; |