beenull/listmonk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix template compilation check on CRUD.

Browse source
This commit is contained in:
Kailash Nadh 2022-07-02 16:16:02 +05:30
parent 3f5a50fc0d
commit 0574a1b820
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cmd/templates.go
View file

@ -2,6 +2,7 @@ package main
import (
"errors"
"html/template"
"net/http"
"regexp"
"strconv"
@ -129,14 +130,19 @@ func handleCreateTemplate(c echo.Context) error {
return err
}
var f template.FuncMap
// Subject is only relevant for fixed tx templates. For campaigns,
// the subject changes per campaign and is on models.Campaign.
if o.Type == models.TemplateTypeCampaign {
o.Subject = ""
f = app.manager.TemplateFuncs(nil)
} else {
f = app.manager.GenericTemplateFuncs()
}
// Compile the template and validate.
if err := o.Compile(app.manager.GenericTemplateFuncs()); err != nil {
if err := o.Compile(f); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, err.Error())
}
@ -175,14 +181,19 @@ func handleUpdateTemplate(c echo.Context) error {
return err
}
var f template.FuncMap
// Subject is only relevant for fixed tx templates. For campaigns,
// the subject changes per campaign and is on models.Campaign.
if o.Type == models.TemplateTypeCampaign {
o.Subject = ""
f = app.manager.TemplateFuncs(nil)
} else {
f = app.manager.GenericTemplateFuncs()
}
// Compile the template and validate.
if err := o.Compile(app.manager.GenericTemplateFuncs()); err != nil {
if err := o.Compile(f); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, err.Error())
}