diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
| commit | 296b93076888c9b26329938bd1cf1587397c7f51 (patch) | |
| tree | a37a396752971c88e13fc97d88531357ca09542e /api/admin.go | |
| parent | fb285d7b32a6c5e559277bcb32b3b7ff6889af22 (diff) | |
| parent | 13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (diff) | |
| download | chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.gz chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.bz2 chat-296b93076888c9b26329938bd1cf1587397c7f51.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
Diffstat (limited to 'api/admin.go')
| -rw-r--r-- | api/admin.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/api/admin.go b/api/admin.go index 568d8f6e8..3ef8c12a8 100644 --- a/api/admin.go +++ b/api/admin.go @@ -82,18 +82,11 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) { return } - if len(cfg.ServiceSettings.ListenAddress) == 0 { - c.SetInvalidParam("saveConfig", "config") - return - } - - if cfg.TeamSettings.MaxUsersPerTeam == 0 { - c.SetInvalidParam("saveConfig", "config") + if err := cfg.IsValid(); err != nil { + c.Err = err return } - // TODO run some cleanup validators - utils.SaveConfig(utils.CfgFileName, cfg) utils.LoadConfig(utils.CfgFileName) json := utils.Cfg.ToJson() |