diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 12:52:50 -0400 |
| commit | 7e418714bce067172e527359f391943459b3bd48 (patch) | |
| tree | fb06d542eddb5ce8d63fce27bfe87f6c9c63adbb /api/api.go | |
| parent | 9828d84f01147ffb87b372d20681f91325ecfcf0 (diff) | |
| parent | 4e3896d7b1911b8c184dee3c650461f0d3c0acea (diff) | |
| download | chat-7e418714bce067172e527359f391943459b3bd48.tar.gz chat-7e418714bce067172e527359f391943459b3bd48.tar.bz2 chat-7e418714bce067172e527359f391943459b3bd48.zip | |
Merge pull request #687 from mattermost/PLT-93
PLT-93 Cleaning up client side configs
Diffstat (limited to 'api/api.go')
| -rw-r--r-- | api/api.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/api/api.go b/api/api.go index 35ac0bdc0..8203b07a6 100644 --- a/api/api.go +++ b/api/api.go @@ -16,10 +16,12 @@ var ServerTemplates *template.Template type ServerTemplatePage Page -func NewServerTemplatePage(templateName, siteURL string) *ServerTemplatePage { - props := make(map[string]string) - props["AnalyticsUrl"] = utils.Cfg.ServiceSettings.AnalyticsUrl - return &ServerTemplatePage{TemplateName: templateName, SiteName: utils.Cfg.ServiceSettings.SiteName, FeedbackEmail: utils.Cfg.EmailSettings.FeedbackEmail, SiteURL: siteURL, Props: props} +func NewServerTemplatePage(templateName string) *ServerTemplatePage { + return &ServerTemplatePage{ + TemplateName: templateName, + Props: make(map[string]string), + ClientProps: utils.ClientProperties, + } } func (me *ServerTemplatePage) Render() string { @@ -40,7 +42,6 @@ func InitApi() { InitWebSocket(r) InitFile(r) InitCommand(r) - InitConfig(r) InitAdmin(r) templatesDir := utils.FindDir("api/templates") |