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

Merge pull request #1636 from mattermost/plt-1354

Browse Source 
PLT-1354 Show channel member count up to 100 now
This commit is contained in:
Christopher Speller
2015-12-08 08:18:17 -05:00
parent 38c313c934 2b0cd7e619
commit d7df0695e3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/channel.go
View File

@@ -740,7 +740,7 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) {
}
scm := Srv.Store.Channel().GetMember(id, c.Session.UserId)
ecm := Srv.Store.Channel().GetExtraMembers(id, 20)
ecm := Srv.Store.Channel().GetExtraMembers(id, 100)
ccm := Srv.Store.Channel().GetMemberCount(id)
if cmresult := <-scm; cmresult.Err != nil {

2
web/react/utils/constants.jsx
View File

@@ -149,7 +149,7 @@ export default {
],
MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
MAX_DMS: 20,
MAX_CHANNEL_POPOVER_COUNT: 20,
MAX_CHANNEL_POPOVER_COUNT: 100,
DM_CHANNEL: 'D',
OPEN_CHANNEL: 'O',
PRIVATE_CHANNEL: 'P',

2
web/sass-files/sass/partials/_headers.scss
View File

@@ -218,7 +218,7 @@
font-size: 14px;
line-height: 56px;
#member_popover {
width: 45px;
width: 50px;
color: #999;
cursor: pointer;
.fa {