diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-14 08:56:56 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-14 08:56:56 -0400 |
| commit | 1138dd67705829a6af0d6c610cf3dbe09082187c (patch) | |
| tree | 23bdc3db76221bead172be1c51eb52a4987636f1 /api4/system.go | |
| parent | 40efd8367a85e3333e9b7cc45c390259d412088c (diff) | |
| download | chat-1138dd67705829a6af0d6c610cf3dbe09082187c.tar.gz chat-1138dd67705829a6af0d6c610cf3dbe09082187c.tar.bz2 chat-1138dd67705829a6af0d6c610cf3dbe09082187c.zip | |
PLT-6657 Move system console to use v4 endpoints and redux (#6572)
* Move system console to use v4 endpoints and redux
* Rename logs dir to get past gitignore
* Fix test email
* Update brand unit test
* Updates per feedback
Diffstat (limited to 'api4/system.go')
| -rw-r--r-- | api4/system.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/api4/system.go b/api4/system.go index 3a077283c..465f4e71d 100644 --- a/api4/system.go +++ b/api4/system.go @@ -52,13 +52,17 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) { } func testEmail(c *Context, w http.ResponseWriter, r *http.Request) { + cfg := model.ConfigFromJson(r.Body) + if cfg == nil { + cfg = utils.Cfg + } if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) return } - err := app.TestEmail(c.Session.UserId, utils.Cfg) + err := app.TestEmail(c.Session.UserId, cfg) if err != nil { c.Err = err return |