diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-28 23:34:34 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-28 23:34:34 -0400 |
commit | 56e31fe4966008d64fd7e57a0efcb0f80b5b2424 (patch) | |
tree | 5c2b2f6cde346fc836cb9eff2c9f4db91a1ffb50 | |
parent | 98a74751bf944698056e9d7628566b222653372d (diff) | |
parent | 0b249cd099d9103c5b0c7014d5587599084e291c (diff) | |
download | chat-56e31fe4966008d64fd7e57a0efcb0f80b5b2424.tar.gz chat-56e31fe4966008d64fd7e57a0efcb0f80b5b2424.tar.bz2 chat-56e31fe4966008d64fd7e57a0efcb0f80b5b2424.zip |
Merge pull request #818 from rgarmsen2295/plt-216
PLT-216 Inactive members are no longer counted, nor shown, as members of a channel
-rw-r--r-- | web/react/components/popover_list_members.jsx | 26 | ||||
-rw-r--r-- | web/react/components/post_info.jsx | 2 |
2 files changed, 18 insertions, 10 deletions
diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx index a2ca8b00f..95a88c3d6 100644 --- a/web/react/components/popover_list_members.jsx +++ b/web/react/components/popover_list_members.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. +var UserStore = require('../stores/user_store.jsx'); + export default class PopoverListMembers extends React.Component { componentDidMount() { const originalLeave = $.fn.popover.Constructor.prototype.leave; @@ -32,22 +34,28 @@ export default class PopoverListMembers extends React.Component { } render() { let popoverHtml = ''; + let count = 0; + let countText = '-'; const members = this.props.members; - let count; - if (members.length > 20) { - count = '20+'; - } else { - count = members.length || '-'; - } + const teamMembers = UserStore.getProfilesUsernameMap(); - if (members) { + if (members && teamMembers) { members.sort(function compareByLocal(a, b) { return a.username.localeCompare(b.username); }); members.forEach(function addMemberElement(m) { - popoverHtml += `<div class='text--nowrap'>${m.username}</div>`; + if (teamMembers[m.username] && teamMembers[m.username].delete_at <= 0) { + popoverHtml += `<div class='text--nowrap'>${m.username}</div>`; + count++; + } }); + + if (count > 20) { + countText = '20+'; + } else if (count > 0) { + countText = count.toString(); + } } return ( @@ -63,7 +71,7 @@ export default class PopoverListMembers extends React.Component { data-toggle='tooltip' title='View Channel Members' > - {count} + {countText} <span className='fa fa-user' aria-hidden='true' diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 824e7ef39..82e746dc0 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -150,7 +150,7 @@ export default class PostInfo extends React.Component { var dropdown = this.createDropdown(); - let tooltip = <Tooltip>{utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}</Tooltip>; + let tooltip = <Tooltip id={post.id + 'tooltip'}>{utils.displayDate(post.create_at)} at ${utils.displayTime(post.create_at)}</Tooltip>; return ( <ul className='post-header post-info'> |