diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-22 21:35:29 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-22 21:35:29 -0700 |
| commit | 6a1934192f9e58b73bebdb4cfba555b281c81f13 (patch) | |
| tree | 22f29ee70d3e87ec1cd0cfe50ba8442123105733 /api/admin.go | |
| parent | 5ecf45e109a5910959e0cc6927b826ce5a406a7d (diff) | |
| parent | 7384b0791e54b0fd980ce8c321566c2c42289c02 (diff) | |
| download | chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.gz chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.tar.bz2 chat-6a1934192f9e58b73bebdb4cfba555b281c81f13.zip | |
Merge pull request #1129 from mattermost/PLT-44
PLT-44 Inital support for multi-tab multi-team login
Diffstat (limited to 'api/admin.go')
| -rw-r--r-- | api/admin.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/admin.go b/api/admin.go index cd1e5d2de..7a5616ede 100644 --- a/api/admin.go +++ b/api/admin.go @@ -24,7 +24,7 @@ func InitAdmin(r *mux.Router) { sr.Handle("/config", ApiUserRequired(getConfig)).Methods("GET") sr.Handle("/save_config", ApiUserRequired(saveConfig)).Methods("POST") sr.Handle("/test_email", ApiUserRequired(testEmail)).Methods("POST") - sr.Handle("/client_props", ApiAppHandler(getClientProperties)).Methods("GET") + sr.Handle("/client_props", ApiAppHandler(getClientConfig)).Methods("GET") sr.Handle("/log_client", ApiAppHandler(logClient)).Methods("POST") } @@ -57,8 +57,8 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) { w.Write([]byte(model.ArrayToJson(lines))) } -func getClientProperties(c *Context, w http.ResponseWriter, r *http.Request) { - w.Write([]byte(model.MapToJson(utils.ClientProperties))) +func getClientConfig(c *Context, w http.ResponseWriter, r *http.Request) { + w.Write([]byte(model.MapToJson(utils.ClientCfg))) } func logClient(c *Context, w http.ResponseWriter, r *http.Request) { |