summaryrefslogtreecommitdiffstats
path: root/app/team.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-07-31 08:52:45 -0700
committerHarrison Healey <harrisonmhealey@gmail.com>2017-07-31 11:52:45 -0400
commit72f61ab96aabf65c162c8d94b5b843b5108ee1a9 (patch)
treec80d7158613663a0b3f584a1736ef1cbff72d160 /app/team.go
parent0f786a42d3289df9b4f5bdb4bddb0ecb07631608 (diff)
downloadchat-72f61ab96aabf65c162c8d94b5b843b5108ee1a9.tar.gz
chat-72f61ab96aabf65c162c8d94b5b843b5108ee1a9.tar.bz2
chat-72f61ab96aabf65c162c8d94b5b843b5108ee1a9.zip
make cli team / channel delete operations also delete webhooks and slash commands (#7028)
Diffstat (limited to 'app/team.go')
-rw-r--r--app/team.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/team.go b/app/team.go
index bff448f7c..e4a71d7d5 100644
--- a/app/team.go
+++ b/app/team.go
@@ -638,7 +638,7 @@ func InviteNewUsersToTeam(emailList []string, teamId, senderId string) *model.Ap
var invalidEmailList []string
for _, email := range emailList {
- if ! isTeamEmailAddressAllowed(email) {
+ if !isTeamEmailAddressAllowed(email) {
invalidEmailList = append(invalidEmailList, email)
}
}
@@ -747,6 +747,10 @@ func PermanentDeleteTeam(team *model.Team) *model.AppError {
return result.Err
}
+ if result := <-Srv.Store.Command().PermanentDeleteByTeam(team.Id); result.Err != nil {
+ return result.Err
+ }
+
if result := <-Srv.Store.Team().PermanentDelete(team.Id); result.Err != nil {
return result.Err
}