remove more global refs (#7480)
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
adab1a660f
Коммит
266ff86702
@@ -7,23 +7,23 @@ import (
|
||||
"github.com/mattermost/mattermost-server/model"
|
||||
)
|
||||
|
||||
func getTeamsFromTeamArgs(teamArgs []string) []*model.Team {
|
||||
func getTeamsFromTeamArgs(a *app.App, teamArgs []string) []*model.Team {
|
||||
teams := make([]*model.Team, 0, len(teamArgs))
|
||||
for _, teamArg := range teamArgs {
|
||||
team := getTeamFromTeamArg(teamArg)
|
||||
team := getTeamFromTeamArg(a, teamArg)
|
||||
teams = append(teams, team)
|
||||
}
|
||||
return teams
|
||||
}
|
||||
|
||||
func getTeamFromTeamArg(teamArg string) *model.Team {
|
||||
func getTeamFromTeamArg(a *app.App, teamArg string) *model.Team {
|
||||
var team *model.Team
|
||||
if result := <-app.Global().Srv.Store.Team().GetByName(teamArg); result.Err == nil {
|
||||
if result := <-a.Srv.Store.Team().GetByName(teamArg); result.Err == nil {
|
||||
team = result.Data.(*model.Team)
|
||||
}
|
||||
|
||||
if team == nil {
|
||||
if result := <-app.Global().Srv.Store.Team().Get(teamArg); result.Err == nil {
|
||||
if result := <-a.Srv.Store.Team().Get(teamArg); result.Err == nil {
|
||||
team = result.Data.(*model.Team)
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user