summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-03-15 19:32:02 +0000
committerGitHub <noreply@github.com>2017-03-15 19:32:02 +0000
commit91d430b2a39a03b052cc103f73f44c68cbc96b2d (patch)
treeda7c188407498aced674937c4802c8a9e848f280 /app
parent8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff)
downloadchat-91d430b2a39a03b052cc103f73f44c68cbc96b2d.tar.gz
chat-91d430b2a39a03b052cc103f73f44c68cbc96b2d.tar.bz2
chat-91d430b2a39a03b052cc103f73f44c68cbc96b2d.zip
Fix policy application in team edition. (#5771)
Diffstat (limited to 'app')
-rw-r--r--app/license.go4
-rw-r--r--app/web_conn.go2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/license.go b/app/license.go
index 87b2d1b05..1efaf85d5 100644
--- a/app/license.go
+++ b/app/license.go
@@ -76,6 +76,8 @@ func SaveLicense(licenseBytes []byte) (*model.License, *model.AppError) {
return nil, model.NewLocAppError("addLicense", model.INVALID_LICENSE_ERROR, nil, "")
}
+ ReloadConfig()
+
InvalidateAllCaches()
return license, nil
@@ -93,6 +95,8 @@ func RemoveLicense() *model.AppError {
return result.Err
}
+ ReloadConfig()
+
InvalidateAllCaches()
return nil
diff --git a/app/web_conn.go b/app/web_conn.go
index 012236513..da6330f5c 100644
--- a/app/web_conn.go
+++ b/app/web_conn.go
@@ -178,7 +178,7 @@ func (webCon *WebConn) IsAuthenticated() bool {
func (webCon *WebConn) SendHello() {
msg := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_HELLO, "", "", webCon.UserId, nil)
- msg.Add("server_version", fmt.Sprintf("%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash))
+ msg.Add("server_version", fmt.Sprintf("%v.%v.%v.%v", model.CurrentVersion, model.BuildNumber, utils.CfgHash, utils.IsLicensed))
msg.DoPreComputeJson()
webCon.Send <- msg
}