diff options
Diffstat (limited to 'webapp/components/user_list.jsx')
-rw-r--r-- | webapp/components/user_list.jsx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/webapp/components/user_list.jsx b/webapp/components/user_list.jsx index 3652723be..626cb3cf5 100644 --- a/webapp/components/user_list.jsx +++ b/webapp/components/user_list.jsx @@ -13,10 +13,18 @@ export default class UserList extends React.Component { let content; if (users.length > 0) { content = users.map((user) => { + var teamMember; + for (var index in this.props.teamMembers) { + if (this.props.teamMembers[index].user_id === user.id) { + teamMember = this.props.teamMembers[index]; + } + } + return ( <UserListRow key={user.id} user={user} + teamMember={teamMember} actions={this.props.actions} actionProps={this.props.actionProps} /> @@ -48,12 +56,14 @@ export default class UserList extends React.Component { UserList.defaultProps = { users: [], + teamMembers: [], actions: [], actionProps: {} }; UserList.propTypes = { users: React.PropTypes.arrayOf(React.PropTypes.object), + teamMembers: React.PropTypes.arrayOf(React.PropTypes.object), actions: React.PropTypes.arrayOf(React.PropTypes.func), actionProps: React.PropTypes.object }; |