[MM-24827] Disable group mentions on e10 or team edition (#14475)
* MM-24827 Disable group mentions when ldap groups not enabled * Trigger CI Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
4c2d34b097
Коммит
0d1eb02341
@@ -740,6 +740,10 @@ func (a *App) allowChannelMentions(post *model.Post, numProfiles int) bool {
|
|||||||
|
|
||||||
// allowGroupMentions returns whether or not the group mentions are allowed for the given post.
|
// allowGroupMentions returns whether or not the group mentions are allowed for the given post.
|
||||||
func (a *App) allowGroupMentions(post *model.Post) bool {
|
func (a *App) allowGroupMentions(post *model.Post) bool {
|
||||||
|
if license := a.License(); license == nil || !*license.Features.LDAPGroups {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
if !a.HasPermissionToChannel(post.UserId, post.ChannelId, model.PERMISSION_USE_GROUP_MENTIONS) {
|
if !a.HasPermissionToChannel(post.UserId, post.ChannelId, model.PERMISSION_USE_GROUP_MENTIONS) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -999,6 +999,13 @@ func TestAllowGroupMentions(t *testing.T) {
|
|||||||
|
|
||||||
post := &model.Post{ChannelId: th.BasicChannel.Id, UserId: th.BasicUser.Id}
|
post := &model.Post{ChannelId: th.BasicChannel.Id, UserId: th.BasicUser.Id}
|
||||||
|
|
||||||
|
t.Run("should return false without ldap groups license", func(t *testing.T) {
|
||||||
|
allowGroupMentions := th.App.allowGroupMentions(post)
|
||||||
|
assert.False(t, allowGroupMentions)
|
||||||
|
})
|
||||||
|
|
||||||
|
th.App.SetLicense(model.NewTestLicense("ldap_groups"))
|
||||||
|
|
||||||
t.Run("should return true for a regular post with few channel members", func(t *testing.T) {
|
t.Run("should return true for a regular post with few channel members", func(t *testing.T) {
|
||||||
allowGroupMentions := th.App.allowGroupMentions(post)
|
allowGroupMentions := th.App.allowGroupMentions(post)
|
||||||
assert.True(t, allowGroupMentions)
|
assert.True(t, allowGroupMentions)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user