diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-03-31 12:47:04 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-31 12:47:04 -0400 |
commit | 720947e17e4e7820dcae6c5e25b5fe8485a7fc6c (patch) | |
tree | 8ca959e5014791aaaed94ca541d0b94c4511fcd2 /webapp/components/popover_list_members.jsx | |
parent | 7dee877c191022560c5eb93582e02370071285fe (diff) | |
parent | 098873e667126ad2e52bc6b61a1ad4e428c56ace (diff) | |
download | chat-720947e17e4e7820dcae6c5e25b5fe8485a7fc6c.tar.gz chat-720947e17e4e7820dcae6c5e25b5fe8485a7fc6c.tar.bz2 chat-720947e17e4e7820dcae6c5e25b5fe8485a7fc6c.zip |
Merge pull request #2595 from hmhealey/plt2480
PLT-2480 Fixed errors when joining a channel that doesn't exist yet
Diffstat (limited to 'webapp/components/popover_list_members.jsx')
-rw-r--r-- | webapp/components/popover_list_members.jsx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx index cd583e4c3..226a1889c 100644 --- a/webapp/components/popover_list_members.jsx +++ b/webapp/components/popover_list_members.jsx @@ -9,8 +9,6 @@ import * as Utils from 'utils/utils.jsx'; import * as GlobalActions from 'action_creators/global_actions.jsx'; import Constants from 'utils/constants.jsx'; -import ChannelStore from 'stores/channel_store.jsx'; - import {FormattedMessage} from 'react-intl'; import React from 'react'; @@ -57,7 +55,6 @@ export default class PopoverListMembers extends React.Component { const members = this.props.members; const teamMembers = UserStore.getProfilesUsernameMap(); const currentUserId = UserStore.getCurrentId(); - const ch = ChannelStore.getCurrent(); if (members && teamMembers) { members.sort((a, b) => { @@ -69,7 +66,7 @@ export default class PopoverListMembers extends React.Component { members.forEach((m, i) => { let button = ''; - if (currentUserId !== m.id && ch.type !== 'D') { + if (currentUserId !== m.id && this.props.channel.type !== 'D') { button = ( <a href='#' @@ -177,7 +174,7 @@ export default class PopoverListMembers extends React.Component { } PopoverListMembers.propTypes = { + channel: React.PropTypes.object.isRequired, members: React.PropTypes.array.isRequired, - memberCount: React.PropTypes.number, - channelId: React.PropTypes.string.isRequired + memberCount: React.PropTypes.number }; |