From ab13de96a053123e6f73ffddb763e0fe96e0f6ed Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Wed, 9 Aug 2017 21:36:27 +0100 Subject: PLT-7288: Allow CLI to delete teams with no channels. (#7135) --- app/team.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/team.go') diff --git a/app/team.go b/app/team.go index e4a71d7d5..b479ed134 100644 --- a/app/team.go +++ b/app/team.go @@ -735,7 +735,9 @@ func PermanentDeleteTeam(team *model.Team) *model.AppError { } if result := <-Srv.Store.Channel().GetTeamChannels(team.Id); result.Err != nil { - return result.Err + if result.Err.Id != "store.sql_channel.get_channels.not_found.app_error" { + return result.Err + } } else { channels := result.Data.(*model.ChannelList) for _, c := range *channels { -- cgit v1.2.3-1-g7c22