From ca61b4bed94ea98530bf4f1b2f7585fe86ef80cd Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 22 Dec 2016 20:44:37 +0000 Subject: PLT-5080 (Server): Channel-Admin level permissions (#4874) Adds permissions for manage/delete public/private channels at the Channel Admin level. --- api/channel.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api/channel.go') diff --git a/api/channel.go b/api/channel.go index 7ccf5e2b6..44efc5efb 100644 --- a/api/channel.go +++ b/api/channel.go @@ -804,11 +804,11 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { // Allow delete if user is the only member left in channel if memberCount > 1 { - if channel.Type == model.CHANNEL_OPEN && !HasPermissionToTeamContext(c, channel.TeamId, model.PERMISSION_DELETE_PUBLIC_CHANNEL) { + if channel.Type == model.CHANNEL_OPEN && !HasPermissionToChannelContext(c, channel.Id, model.PERMISSION_DELETE_PUBLIC_CHANNEL) { return } - if channel.Type == model.CHANNEL_PRIVATE && !HasPermissionToTeamContext(c, channel.TeamId, model.PERMISSION_DELETE_PRIVATE_CHANNEL) { + if channel.Type == model.CHANNEL_PRIVATE && !HasPermissionToChannelContext(c, channel.Id, model.PERMISSION_DELETE_PRIVATE_CHANNEL) { return } } -- cgit v1.2.3-1-g7c22