Added ability to have "{{.From}}" in sending a test email. Fixes #162

pull/165/head
Jordan Wright 2016-02-17 21:09:19 -06:00
parent 6403a51c3e
commit 3f08c160ec
2 changed files with 4 additions and 3 deletions

View File

@ -72,6 +72,7 @@ type SendTestEmailRequest struct {
URL string `json:"url"` URL string `json:"url"`
Tracker string `json:"tracker"` Tracker string `json:"tracker"`
TrackingURL string `json:"tracking_url"` TrackingURL string `json:"tracking_url"`
From string `json:"from"`
Target Target
} }

View File

@ -178,9 +178,9 @@ func SendTestEmail(s *models.SendTestEmailRequest) error {
Logger.Println(err) Logger.Println(err)
return err return err
} }
ft := f.Name s.From = f.Name
if ft == "" { if s.From == "" {
ft = f.Address s.From = f.Address
} }
Logger.Println("Creating email using template") Logger.Println("Creating email using template")
// Parse the templates // Parse the templates