From 1f65f0e3d6d142b859f8dda52da99cb3d4a01c9c Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 21 Jun 2018 12:02:35 +0100 Subject: MM-10233: Add scheme importing to bulk importer. (#8928) --- app/team.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'app/team.go') diff --git a/app/team.go b/app/team.go index d6245b6df..beb4b1449 100644 --- a/app/team.go +++ b/app/team.go @@ -105,8 +105,9 @@ func (a *App) UpdateTeam(team *model.Team) (*model.Team, *model.AppError) { oldTeam.AllowedDomains = team.AllowedDomains oldTeam.LastTeamIconUpdate = team.LastTeamIconUpdate - if result := <-a.Srv.Store.Team().Update(oldTeam); result.Err != nil { - return nil, result.Err + oldTeam, err = a.updateTeamUnsanitized(oldTeam) + if err != nil { + return team, err } a.sendTeamEvent(oldTeam, model.WEBSOCKET_EVENT_UPDATE_TEAM) @@ -114,6 +115,14 @@ func (a *App) UpdateTeam(team *model.Team) (*model.Team, *model.AppError) { return oldTeam, nil } +func (a *App) updateTeamUnsanitized(team *model.Team) (*model.Team, *model.AppError) { + if result := <-a.Srv.Store.Team().Update(team); result.Err != nil { + return nil, result.Err + } else { + return result.Data.(*model.Team), nil + } +} + func (a *App) UpdateTeamScheme(team *model.Team) (*model.Team, *model.AppError) { var oldTeam *model.Team var err *model.AppError -- cgit v1.2.3-1-g7c22