diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-12-04 08:21:39 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-04 08:21:39 -0500 |
commit | 04727955cd73864d23be9da7fb999d23e93a20e0 (patch) | |
tree | 60f7b58a68693a7b80853ec88f533264c104e9ae /web/react/components/channel_members_modal.jsx | |
parent | 93db32da7b97f4d4c10afc17f48c2221eefb54c7 (diff) | |
parent | bc173ebcb47f60d5e99081156575a8ace98fe168 (diff) | |
download | chat-04727955cd73864d23be9da7fb999d23e93a20e0.tar.gz chat-04727955cd73864d23be9da7fb999d23e93a20e0.tar.bz2 chat-04727955cd73864d23be9da7fb999d23e93a20e0.zip |
Merge pull request #1600 from hmhealey/plt1152
PLT-1152 Fix cross-contamination between invite member modals
Diffstat (limited to 'web/react/components/channel_members_modal.jsx')
-rw-r--r-- | web/react/components/channel_members_modal.jsx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx index f07fc166a..d1b9df988 100644 --- a/web/react/components/channel_members_modal.jsx +++ b/web/react/components/channel_members_modal.jsx @@ -69,16 +69,9 @@ export default class ChannelMembersModal extends React.Component { memberList.sort(compareByUsername); nonmemberList.sort(compareByUsername); - const channel = ChannelStore.getCurrent(); - let channelName = ''; - if (channel) { - channelName = channel.display_name; - } - return { nonmemberList, - memberList, - channelName + memberList }; } onShow() { @@ -169,7 +162,7 @@ export default class ChannelMembersModal extends React.Component { onHide={this.props.onModalDismissed} > <Modal.Header closeButton={true}> - <Modal.Title><span className='name'>{this.state.channelName}</span>{' Members'}</Modal.Title> + <Modal.Title><span className='name'>{this.props.channel.display_name}</span>{' Members'}</Modal.Title> <a className='btn btn-md btn-primary' href='#' @@ -205,7 +198,8 @@ export default class ChannelMembersModal extends React.Component { </Modal> <ChannelInviteModal show={this.state.showInviteModal} - onModalDismissed={() => this.setState({showInviteModal: false})} + onHide={() => this.setState({showInviteModal: false})} + channel={this.props.channel} /> </div> ); @@ -218,5 +212,6 @@ ChannelMembersModal.defaultProps = { ChannelMembersModal.propTypes = { show: React.PropTypes.bool.isRequired, - onModalDismissed: React.PropTypes.func.isRequired + onModalDismissed: React.PropTypes.func.isRequired, + channel: React.PropTypes.object.isRequired }; |