diff options
| author | George Goldberg <george@gberg.me> | 2018-03-13 13:36:23 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-13 13:36:23 +0000 |
| commit | fadcdd271a68b38571b75d1d38ab023f940ac83a (patch) | |
| tree | 7f413edd35401b54b2f4eb4a687da1ac273bcd4b /api4/system.go | |
| parent | b66e4bc932ed76c1cfd2b5f4ec0cfce70cd9fbb4 (diff) | |
| parent | f2d26801b9647715fb43af873354d8def753868b (diff) | |
| download | chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.gz chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.bz2 chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'api4/system.go')
| -rw-r--r-- | api4/system.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/api4/system.go b/api4/system.go index aab65bf20..c1541f0b5 100644 --- a/api4/system.go +++ b/api4/system.go @@ -8,7 +8,6 @@ import ( "io" "net/http" "runtime" - "strconv" l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/model" @@ -247,14 +246,7 @@ func getClientConfig(c *Context, w http.ResponseWriter, r *http.Request) { return } - respCfg := map[string]string{} - for k, v := range c.App.ClientConfig() { - respCfg[k] = v - } - - respCfg["NoAccounts"] = strconv.FormatBool(c.App.IsFirstUserAccount()) - - w.Write([]byte(model.MapToJson(respCfg))) + w.Write([]byte(model.MapToJson(c.App.ClientConfigWithNoAccounts()))) } func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) { |