Merge pull request #1636 from mattermost/plt-1354
PLT-1354 Show channel member count up to 100 now
Этот коммит содержится в:
@@ -740,7 +740,7 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
scm := Srv.Store.Channel().GetMember(id, c.Session.UserId)
|
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)
|
ccm := Srv.Store.Channel().GetMemberCount(id)
|
||||||
|
|
||||||
if cmresult := <-scm; cmresult.Err != nil {
|
if cmresult := <-scm; cmresult.Err != nil {
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ export default {
|
|||||||
],
|
],
|
||||||
MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
|
MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
|
||||||
MAX_DMS: 20,
|
MAX_DMS: 20,
|
||||||
MAX_CHANNEL_POPOVER_COUNT: 20,
|
MAX_CHANNEL_POPOVER_COUNT: 100,
|
||||||
DM_CHANNEL: 'D',
|
DM_CHANNEL: 'D',
|
||||||
OPEN_CHANNEL: 'O',
|
OPEN_CHANNEL: 'O',
|
||||||
PRIVATE_CHANNEL: 'P',
|
PRIVATE_CHANNEL: 'P',
|
||||||
|
|||||||
@@ -218,7 +218,7 @@
|
|||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 56px;
|
line-height: 56px;
|
||||||
#member_popover {
|
#member_popover {
|
||||||
width: 45px;
|
width: 50px;
|
||||||
color: #999;
|
color: #999;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
.fa {
|
.fa {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user