summaryrefslogtreecommitdiffstats
path: root/api/license.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-09-13 12:42:48 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-09-13 12:42:48 -0400
commit1e7985a87a72bea9a308cf1506dacc828c6e2e1c (patch)
treed4251391dc74a9ff4628dd1bed551c34d806a1b6 /api/license.go
parent05af5d14b8d07b010c70750ae1ac5ddf22c120a7 (diff)
downloadchat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.tar.gz
chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.tar.bz2
chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.zip
Modifying permissions system. (#3897)
Diffstat (limited to 'api/license.go')
-rw-r--r--api/license.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/api/license.go b/api/license.go
index b7bf8a234..cff7d7515 100644
--- a/api/license.go
+++ b/api/license.go
@@ -173,14 +173,17 @@ func RemoveLicense() *model.AppError {
}
func getClientLicenceConfig(c *Context, w http.ResponseWriter, r *http.Request) {
- etag := utils.GetClientLicenseEtag(!c.IsSystemAdmin())
+ useSanitizedLicense := !HasPermissionToContext(c, model.PERMISSION_MANAGE_SYSTEM)
+ c.Err = nil
+
+ etag := utils.GetClientLicenseEtag(useSanitizedLicense)
if HandleEtag(etag, w, r) {
return
}
var clientLicense map[string]string
- if c.IsSystemAdmin() {
+ if useSanitizedLicense {
clientLicense = utils.ClientLicense
} else {
clientLicense = utils.GetSanitizedClientLicense()