diff options
| author | George Goldberg <george@gberg.me> | 2018-02-13 13:35:52 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-13 13:46:01 +0000 |
| commit | 5c101253c5987743cf1b3a8fe68814d748070622 (patch) | |
| tree | e2632505d051e7d15d6daf974ed8ac92095f82fe /api4/role.go | |
| parent | b7fc3d7d35ca4dd16097715a66463392a1dfaf0a (diff) | |
| parent | d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (diff) | |
| download | chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.gz chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.bz2 chat-5c101253c5987743cf1b3a8fe68814d748070622.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'api4/role.go')
| -rw-r--r-- | api4/role.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/api4/role.go b/api4/role.go index ac9364c35..e7654011d 100644 --- a/api4/role.go +++ b/api4/role.go @@ -7,7 +7,6 @@ import ( "net/http" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (api *API) InitRole() { @@ -86,7 +85,7 @@ func patchRole(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !utils.IsLicensed() && patch.Permissions != nil { + if c.App.License() == nil && patch.Permissions != nil { allowedPermissions := []string{ model.PERMISSION_CREATE_TEAM.Id, model.PERMISSION_MANAGE_WEBHOOKS.Id, |