summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-22 01:15:41 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-22 01:15:41 -0700
commit08a3acbb44b043b9bb56f9b96e91432352d06d1a (patch)
treeceb451571691d0530ff2c97a033fcc206c42d3ea /utils/config.go
parentf05a2c03d5dbf5b0b7d09148a37d2325012b309f (diff)
downloadchat-08a3acbb44b043b9bb56f9b96e91432352d06d1a.tar.gz
chat-08a3acbb44b043b9bb56f9b96e91432352d06d1a.tar.bz2
chat-08a3acbb44b043b9bb56f9b96e91432352d06d1a.zip
Adding team settings to admin console
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/utils/config.go b/utils/config.go
index 4a5746830..45f62dc19 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -173,7 +173,7 @@ func getClientProperties(c *model.Config) map[string]string {
props["BuildDate"] = model.BuildDate
props["BuildHash"] = model.BuildHash
- props["SiteName"] = c.ServiceSettings.SiteName
+ props["SiteName"] = c.TeamSettings.SiteName
props["AnalyticsUrl"] = c.ServiceSettings.AnalyticsUrl
props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider)
props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey
@@ -186,11 +186,10 @@ func getClientProperties(c *model.Config) map[string]string {
props["AllowSignUpWithGitLab"] = strconv.FormatBool(c.GitLabSettings.Allow)
props["ShowEmailAddress"] = strconv.FormatBool(c.PrivacySettings.ShowEmailAddress)
- props["AllowPublicLink"] = strconv.FormatBool(c.TeamSettings.AllowPublicLink)
+ props["EnablePublicLink"] = strconv.FormatBool(c.ImageSettings.EnablePublicLink)
props["ProfileHeight"] = fmt.Sprintf("%v", c.ImageSettings.ProfileHeight)
props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth)
- props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth)
return props
}