diff options
author | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
---|---|---|
committer | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
commit | 18fa32567b56584c6e24da2ae68814d5bf8ece6f (patch) | |
tree | 311ab6a3918ba64ac665286f15950b32dc1b1dba /app/role.go | |
parent | 7b2861de3a09cf00d00b0872cc537d54302c4bfa (diff) | |
parent | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (diff) | |
download | chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.gz chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.bz2 chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.zip |
Merge branch 'release-4.7' into XYZ-110
Diffstat (limited to 'app/role.go')
-rw-r--r-- | app/role.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/role.go b/app/role.go index 9f271ea7a..5f39dd623 100644 --- a/app/role.go +++ b/app/role.go @@ -12,6 +12,8 @@ func (a *App) Role(id string) *model.Role { return a.roles[id] } -func (a *App) setDefaultRolesBasedOnConfig() { - a.roles = utils.DefaultRolesBasedOnConfig(a.Config(), a.License() != nil) +// Updates the roles based on the app config and the global license check. You may need to invoke +// this when license changes are made. +func (a *App) SetDefaultRolesBasedOnConfig() { + a.roles = utils.DefaultRolesBasedOnConfig(a.Config()) } |