Migrate Team.PermanentDelete to Sync by default #11128 (#11190)

* Migrate Team.PermanentDelete to Sync by default #11128

* resolve merge

* fix jenkin errors in  app/team.go
Этот коммит содержится в:
Taufiq Rahman
2019-06-17 14:37:46 +06:00
коммит произвёл Jesús Espino
родитель 1a57018adf
Коммит 9ffdb794b1
5 изменённых файлов: 16 добавлений и 18 удалений

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

@@ -451,13 +451,11 @@ func (s SqlTeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Tea
return teams, nil
}
func (s SqlTeamStore) PermanentDelete(teamId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
if _, err := s.GetMaster().Exec("DELETE FROM Teams WHERE Id = :TeamId", map[string]interface{}{"TeamId": teamId}); err != nil {
result.Err = model.NewAppError("SqlTeamStore.Delete", "store.sql_team.permanent_delete.app_error", nil, "teamId="+teamId+", "+err.Error(), http.StatusInternalServerError)
return
}
})
func (s SqlTeamStore) PermanentDelete(teamId string) *model.AppError {
if _, err := s.GetMaster().Exec("DELETE FROM Teams WHERE Id = :TeamId", map[string]interface{}{"TeamId": teamId}); err != nil {
return model.NewAppError("SqlTeamStore.Delete", "store.sql_team.permanent_delete.app_error", nil, "teamId="+teamId+", "+err.Error(), http.StatusInternalServerError)
}
return nil
}
func (s SqlTeamStore) AnalyticsTeamCount() (int64, *model.AppError) {