diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 18:36:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 18:36:39 -0600 |
| commit | fbef16f8630f74248157c2cd9e546ece355c869a (patch) | |
| tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /app/role.go | |
| parent | 56f49cf4860cfca51e852ec3e7d9df772d2b2060 (diff) | |
| parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
| download | chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.gz chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.bz2 chat-fbef16f8630f74248157c2cd9e546ece355c869a.zip | |
Merge branch 'release-4.7' into rm-willnorris-proxy-support
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()) } |