summaryrefslogtreecommitdiffstats
path: root/web/react/components/channel_header.jsx
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-11-12 11:25:46 -0500
committerhmhealey <harrisonmhealey@gmail.com>2015-11-12 11:25:46 -0500
commitbe43522117e637271509cf24244f554a437c0578 (patch)
tree53b3d49a095efa96fa80592fdc2a5f5257b78058 /web/react/components/channel_header.jsx
parent13a251a5ee940383e5a026284275b1f31fb476df (diff)
downloadchat-be43522117e637271509cf24244f554a437c0578.tar.gz
chat-be43522117e637271509cf24244f554a437c0578.tar.bz2
chat-be43522117e637271509cf24244f554a437c0578.zip
Added ChannelExtra.MemberCount field to reflect the actual member count when we truncate the list of members to 20
Diffstat (limited to 'web/react/components/channel_header.jsx')
-rw-r--r--web/react/components/channel_header.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 895dc5fe4..dcc3bf87d 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -39,11 +39,14 @@ export default class ChannelHeader extends React.Component {
this.state = state;
}
getStateFromStores() {
+ const extraInfo = ChannelStore.getCurrentExtraInfo();
+
return {
channel: ChannelStore.getCurrent(),
memberChannel: ChannelStore.getCurrentMember(),
memberTeam: UserStore.getCurrentUser(),
- users: ChannelStore.getCurrentExtraInfo().members,
+ users: extraInfo.members,
+ userCount: extraInfo.member_count,
searchVisible: SearchStore.getSearchResults() !== null
};
}
@@ -373,6 +376,7 @@ export default class ChannelHeader extends React.Component {
<th>
<PopoverListMembers
members={this.state.users}
+ memberCount={this.state.userCount}
channelId={channel.id}
/>
</th>