diff options
| author | Corey Hulen <corey@hulen.com> | 2016-05-26 04:55:37 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-26 07:55:37 -0400 |
| commit | 56cca6be7cb3e15a99960c4e6c931081fd157d68 (patch) | |
| tree | fdf5e7e8b61d787889ad983c3ac2b2df8cd9dc4a /api/admin.go | |
| parent | 7b2538fc6c62175622b46d497c4048a7ccb762d1 (diff) | |
| download | chat-56cca6be7cb3e15a99960c4e6c931081fd157d68.tar.gz chat-56cca6be7cb3e15a99960c4e6c931081fd157d68.tar.bz2 chat-56cca6be7cb3e15a99960c4e6c931081fd157d68.zip | |
PLT-2976 Adding checkout for missing SMTP server when testing email connection (#3115)
* PLT-2976 Adding checkout for missing SMTP server when testing email connection
* Fixing unit test
Diffstat (limited to 'api/admin.go')
| -rw-r--r-- | api/admin.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/api/admin.go b/api/admin.go index 52e412976..096235a65 100644 --- a/api/admin.go +++ b/api/admin.go @@ -184,6 +184,11 @@ func testEmail(c *Context, w http.ResponseWriter, r *http.Request) { return } + if len(utils.Cfg.EmailSettings.SMTPServer) == 0 { + c.Err = model.NewLocAppError("testEmail", "api.admin.test_email.missing_server", nil, utils.T("api.context.invalid_param.app_error", map[string]interface{}{"Name": "SMTPServer"})) + return + } + if result := <-Srv.Store.User().Get(c.Session.UserId); result.Err != nil { c.Err = result.Err return |