diff options
| author | George Goldberg <george@gberg.me> | 2017-08-09 21:36:27 +0100 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-09 13:36:27 -0700 |
| commit | ab13de96a053123e6f73ffddb763e0fe96e0f6ed (patch) | |
| tree | 05e2017a6eced25d09244585ee533e0fe88ef7d8 /app/team.go | |
| parent | ff0811e4a4f5189293b54a1d195eaec30b3e530f (diff) | |
| download | chat-ab13de96a053123e6f73ffddb763e0fe96e0f6ed.tar.gz chat-ab13de96a053123e6f73ffddb763e0fe96e0f6ed.tar.bz2 chat-ab13de96a053123e6f73ffddb763e0fe96e0f6ed.zip | |
PLT-7288: Allow CLI to delete teams with no channels. (#7135)
Diffstat (limited to 'app/team.go')
| -rw-r--r-- | app/team.go | 4 |
1 files changed, 3 insertions, 1 deletions
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 { |