diff options
Diffstat (limited to 'app/team.go')
-rw-r--r-- | app/team.go | 13 |
1 files changed, 11 insertions, 2 deletions
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 |