MM-25014 - Default Group Name to null, until AllowGroupReference is set (#14651)
* make Group.Name a pointer to allow null * fix unit tests * fix build error * fix unit test * ensure Name field not nil Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
91f010b8b7
Коммит
ebece6c23a
@@ -658,7 +658,9 @@ func (m *ExplicitMentions) addGroupMention(word string, groups map[string]*model
|
||||
m.GroupMentions = make(map[string]*model.Group)
|
||||
}
|
||||
|
||||
m.GroupMentions[group.Name] = group
|
||||
if group.Name != nil {
|
||||
m.GroupMentions[*group.Name] = group
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
@@ -766,7 +768,9 @@ func (a *App) getGroupsAllowedForReferenceInChannel(channel *model.Channel, team
|
||||
return nil, err
|
||||
}
|
||||
for _, group := range groups {
|
||||
groupsMap[group.Group.Name] = &group.Group
|
||||
if group.Group.Name != nil {
|
||||
groupsMap[*group.Group.Name] = &group.Group
|
||||
}
|
||||
}
|
||||
return groupsMap, nil
|
||||
}
|
||||
@@ -776,7 +780,9 @@ func (a *App) getGroupsAllowedForReferenceInChannel(channel *model.Channel, team
|
||||
return nil, err
|
||||
}
|
||||
for _, group := range groups {
|
||||
groupsMap[group.Name] = group
|
||||
if group.Name != nil {
|
||||
groupsMap[*group.Name] = group
|
||||
}
|
||||
}
|
||||
|
||||
return groupsMap, nil
|
||||
|
||||
Ссылка в новой задаче
Block a user