summaryrefslogtreecommitdiffstats
path: root/app/app.go
diff options
context:
space:
mode:
authorMartin Kraft <mkraft@users.noreply.github.com>2018-02-09 10:57:07 -0500
committerGitHub <noreply@github.com>2018-02-09 10:57:07 -0500
commit3b83cc7dd3fc8c6281bbd74b5b85a6a06efcbb6d (patch)
tree214b35bb91e99a259b11fbf4a44c4e06adbfe9b3 /app/app.go
parent0aa7ecd5e89f054ae927b246f2aec4bd6348d42b (diff)
downloadchat-3b83cc7dd3fc8c6281bbd74b5b85a6a06efcbb6d.tar.gz
chat-3b83cc7dd3fc8c6281bbd74b5b85a6a06efcbb6d.tar.bz2
chat-3b83cc7dd3fc8c6281bbd74b5b85a6a06efcbb6d.zip
XYZ-51: Unit tests for and changes to SetRolePermissionsFromConfig. (#8160)
* XYZ-10: Role store. * XYZ-37: Update unit tests to work with database roles. * XYZ-51: Tests 'SetRolePermissionsFromConfig' against JSON from policy page. * XYZ-51: Adds permissions in non-licensed cases also. * XYZ-51: Removes some permissions from team_user role. * XYZ-51: Merge fix for change to default permissions from PR 8208. * XYZ-51: Removes unused function.
Diffstat (limited to 'app/app.go')
-rw-r--r--app/app.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/app.go b/app/app.go
index 4cc9ff7df..ffb903b57 100644
--- a/app/app.go
+++ b/app/app.go
@@ -460,7 +460,7 @@ func (a *App) DoAdvancedPermissionsMigration() {
l4g.Info("Migrating roles to database.")
roles := model.MakeDefaultRoles()
- roles = utils.SetRolePermissionsFromConfig(roles, a.Config())
+ roles = utils.SetRolePermissionsFromConfig(roles, a.Config(), utils.IsLicensed())
allSucceeded := true