PLT-6162: Search for users not in a given team. (#5943)
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
da5265681d
Коммит
232a99f0c7
16
app/user.go
16
app/user.go
@@ -1299,6 +1299,8 @@ func SearchUsers(props *model.UserSearch, searchOptions map[string]bool, asAdmin
|
||||
return SearchUsersInChannel(props.InChannelId, props.Term, searchOptions, asAdmin)
|
||||
} else if props.NotInChannelId != "" {
|
||||
return SearchUsersNotInChannel(props.TeamId, props.NotInChannelId, props.Term, searchOptions, asAdmin)
|
||||
} else if props.NotInTeamId != "" {
|
||||
return SearchUsersNotInTeam(props.NotInTeamId, props.Term, searchOptions, asAdmin)
|
||||
} else {
|
||||
return SearchUsersInTeam(props.TeamId, props.Term, searchOptions, asAdmin)
|
||||
}
|
||||
@@ -1346,6 +1348,20 @@ func SearchUsersInTeam(teamId string, term string, searchOptions map[string]bool
|
||||
}
|
||||
}
|
||||
|
||||
func SearchUsersNotInTeam(notInTeamId string, term string, searchOptions map[string]bool, asAdmin bool) ([]*model.User, *model.AppError) {
|
||||
if result := <-Srv.Store.User().SearchNotInTeam(notInTeamId, term, searchOptions); result.Err != nil {
|
||||
return nil, result.Err
|
||||
} else {
|
||||
users := result.Data.([]*model.User)
|
||||
|
||||
for _, user := range users {
|
||||
SanitizeProfile(user, asAdmin)
|
||||
}
|
||||
|
||||
return users, nil
|
||||
}
|
||||
}
|
||||
|
||||
func SearchUsersWithoutTeam(term string, searchOptions map[string]bool, asAdmin bool) ([]*model.User, *model.AppError) {
|
||||
if result := <-Srv.Store.User().SearchWithoutTeam(term, searchOptions); result.Err != nil {
|
||||
return nil, result.Err
|
||||
|
||||
Ссылка в новой задаче
Block a user