diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
| commit | 3bd350dcaf65a89040f7ea395a19b620819ba03e (patch) | |
| tree | 72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /api/channel.go | |
| parent | e06e292be71ca699d90bafbd635118aa47c2d7a5 (diff) | |
| parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
| download | chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2 chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip | |
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/channel.go b/api/channel.go index b40366719..63acaa8d1 100644 --- a/api/channel.go +++ b/api/channel.go @@ -191,7 +191,7 @@ func updateChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !strings.Contains(channelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !strings.Contains(c.Session.Roles, model.ROLE_ADMIN) { + if !strings.Contains(channelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !strings.Contains(c.Session.Roles, model.ROLE_TEAM_ADMIN) { c.Err = model.NewAppError("updateChannel", "You do not have the appropriate permissions", "") c.Err.StatusCode = http.StatusForbidden return @@ -514,7 +514,7 @@ func deleteChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !strings.Contains(channelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !strings.Contains(c.Session.Roles, model.ROLE_ADMIN) { + if !strings.Contains(channelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !strings.Contains(c.Session.Roles, model.ROLE_TEAM_ADMIN) { c.Err = model.NewAppError("deleteChannel", "You do not have the appropriate permissions", "") c.Err.StatusCode = http.StatusForbidden return @@ -756,7 +756,7 @@ func removeChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !strings.Contains(channelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !strings.Contains(c.Session.Roles, model.ROLE_ADMIN) { + if !strings.Contains(channelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !strings.Contains(c.Session.Roles, model.ROLE_TEAM_ADMIN) { c.Err = model.NewAppError("updateChannel", "You do not have the appropriate permissions ", "") c.Err.StatusCode = http.StatusForbidden return |