IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-54260: In Browse Channel Modal fix member count on private channels and when there is only 1 member in the channel (#24452)

Browse Source
This commit is contained in:
Sinan Sonmez (Chaush) 2023-09-09 11:17:06 +02:00 committed by GitHub
parent 060a63a3ed
commit 71fb10ae7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/channels/store/sqlstore/channel_store.go
View File

@ -2312,6 +2312,10 @@ func (s SqlChannelStore) GetChannelsMemberCount(channelIDs []string) (_ map[stri
defer rows.Close() defer rows.Close()
memberCounts := make(map[string]int64) memberCounts := make(map[string]int64)
// Initialize member counts for channels with zero members
for _, channelID := range channelIDs {
memberCounts[channelID] = 0
}
for rows.Next() { for rows.Next() {
var channelID string var channelID string
var count int64 var count int64

1
webapp/channels/src/components/browse_channels/browse_channels.tsx
View File

@ -116,6 +116,7 @@ export default class BrowseChannels extends React.PureComponent<Props, State> {
return result.data ? result.data.map((channel) => channel.id) : []; return result.data ? result.data.map((channel) => channel.id) : [];
}, },
); );
this.props.privateChannels.forEach((channel) => channelIDsForMemberCount.push(channel.id));
if (channelIDsForMemberCount.length > 0) { if (channelIDsForMemberCount.length > 0) {
this.props.actions.getChannelsMemberCount(channelIDsForMemberCount); this.props.actions.getChannelsMemberCount(channelIDsForMemberCount);
} }