diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-09 15:00:07 -0400 |
| commit | d3e14a1bf86ac6148e09f888384cb46c61f23cdc (patch) | |
| tree | 1c634c90166964f5184cb1ebd20ffb8ed209b120 /api4/channel.go | |
| parent | 60cf74352f13874a7d07c609c03b1c763af19cea (diff) | |
| parent | c1853c7f40dd67c49524c8ea884ab61883a6abdd (diff) | |
| download | chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.gz chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.tar.bz2 chat-d3e14a1bf86ac6148e09f888384cb46c61f23cdc.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'api4/channel.go')
| -rw-r--r-- | api4/channel.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/api4/channel.go b/api4/channel.go index a19a1b094..e5101ada8 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -154,15 +154,13 @@ func convertChannelToPrivate(c *Context, w http.ResponseWriter, r *http.Request) return } - if !c.App.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { - c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) - return - } - oldPublicChannel, err := c.App.GetChannel(c.Params.ChannelId) if err != nil { c.Err = err return + } else if !c.App.SessionHasPermissionToTeam(c.Session, oldPublicChannel.TeamId, model.PERMISSION_MANAGE_TEAM) { + c.SetPermissionError(model.PERMISSION_MANAGE_TEAM) + return } else if oldPublicChannel.Type == model.CHANNEL_PRIVATE { c.Err = model.NewAppError("convertChannelToPrivate", "api.channel.convert_channel_to_private.private_channel_error", nil, "", http.StatusBadRequest) return |