diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-13 12:32:03 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-13 12:32:03 -0500 |
commit | c5c96082c5b076d4776e18503d9317cdaeb6066c (patch) | |
tree | 0b4552a106609e11f388f940fe829da939d25a0c /web/react | |
parent | 4056e42488bd45cef626c804f2c14f64268fe6fe (diff) | |
parent | 43cb220dcdf6b8906f1c5f9640ad7103dcf8a957 (diff) | |
download | chat-c5c96082c5b076d4776e18503d9317cdaeb6066c.tar.gz chat-c5c96082c5b076d4776e18503d9317cdaeb6066c.tar.bz2 chat-c5c96082c5b076d4776e18503d9317cdaeb6066c.zip |
Merge pull request #1422 from hmhealey/plt906
PLT-906 Improved client-side handling when ExtraInfo.MemberCount may not be set
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/popover_list_members.jsx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx index bd6b6d3bd..102bddcf5 100644 --- a/web/react/components/popover_list_members.jsx +++ b/web/react/components/popover_list_members.jsx @@ -69,7 +69,6 @@ export default class PopoverListMembers extends React.Component { render() { let popoverHtml = []; - let countText = '-'; const members = this.props.members; const teamMembers = UserStore.getProfilesUsernameMap(); const currentUserId = UserStore.getCurrentId(); @@ -148,13 +147,20 @@ export default class PopoverListMembers extends React.Component { ); } }); + } - const count = this.props.memberCount; - if (count > 20) { - countText = '20+'; - } else if (count > 0) { - countText = count.toString(); - } + let count = this.props.memberCount; + let countText = '-'; + + // fall back to checking the length of the member list if the count isn't set + if (!count && members) { + count = members.length; + } + + if (count > 20) { + countText = '20+'; + } else if (count > 0) { + countText = count.toString(); } return ( @@ -194,6 +200,6 @@ export default class PopoverListMembers extends React.Component { PopoverListMembers.propTypes = { members: React.PropTypes.array.isRequired, - memberCount: React.PropTypes.number.isRequired, + memberCount: React.PropTypes.number, channelId: React.PropTypes.string.isRequired }; |