Team.GetTeamsByScheme migrated to sync by default. (#11563)

Этот коммит содержится в:
Max Vovshin
2019-07-08 22:30:32 +03:00
коммит произвёл Jesús Espino
родитель 15c3c5f9e6
Коммит bed9102eb1
5 изменённых файлов: 35 добавлений и 32 удалений

Просмотреть файл

@@ -800,16 +800,13 @@ func (us SqlTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) *m
return nil
}
func (s SqlTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
var teams []*model.Team
_, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE SchemeId = :SchemeId ORDER BY DisplayName LIMIT :Limit OFFSET :Offset", map[string]interface{}{"SchemeId": schemeId, "Offset": offset, "Limit": limit})
if err != nil {
result.Err = model.NewAppError("SqlTeamStore.GetTeamsByScheme", "store.sql_team.get_by_scheme.app_error", nil, "schemeId="+schemeId+" "+err.Error(), http.StatusInternalServerError)
return
}
result.Data = teams
})
func (s SqlTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, *model.AppError) {
var teams []*model.Team
_, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE SchemeId = :SchemeId ORDER BY DisplayName LIMIT :Limit OFFSET :Offset", map[string]interface{}{"SchemeId": schemeId, "Offset": offset, "Limit": limit})
if err != nil {
return nil, model.NewAppError("SqlTeamStore.GetTeamsByScheme", "store.sql_team.get_by_scheme.app_error", nil, "schemeId="+schemeId+" "+err.Error(), http.StatusInternalServerError)
}
return teams, nil
}
// This function does the Advanced Permissions Phase 2 migration for TeamMember objects. It performs the migration