USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

email: fix unable to override templates in custom directory (#7905) 

Co-authored-by: Joe Chen <jc@unknwon.io>
pull/7930/head
宋子桓🌈 2025-02-13 10:52:18 +08:00 committed by GitHub
parent 9c80e6d922
commit 46a84fdad5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ All notable changes to Gogs are documented in this file.
- Submodules using `ssh://` protocol and a port number are not rendered correctly. [#4941](https://github.com/gogs/gogs/issues/4941) - Submodules using `ssh://` protocol and a port number are not rendered correctly. [#4941](https://github.com/gogs/gogs/issues/4941)
- Missing link to user profile on the first commit in commits history page. [#7404](https://github.com/gogs/gogs/issues/7404) - Missing link to user profile on the first commit in commits history page. [#7404](https://github.com/gogs/gogs/issues/7404)
- Unable to override email templates in custom directory. [#7905](https://github.com/gogs/gogs/pull/7905)
## 0.13.2 ## 0.13.2

5
internal/cmd/web.go
View File

@ -112,14 +112,15 @@ func newMacaron() *macaron.Macaron {
}, },
)) ))
customDir := filepath.Join(conf.CustomDir(), "templates")
renderOpt := macaron.RenderOptions{ renderOpt := macaron.RenderOptions{
Directory: filepath.Join(conf.WorkDir(), "templates"), Directory: filepath.Join(conf.WorkDir(), "templates"),
AppendDirectories: []string{filepath.Join(conf.CustomDir(), "templates")}, AppendDirectories: []string{customDir},
Funcs: template.FuncMap(), Funcs: template.FuncMap(),
IndentJSON: macaron.Env != macaron.PROD, IndentJSON: macaron.Env != macaron.PROD,
} }
if !conf.Server.LoadAssetsFromDisk { if !conf.Server.LoadAssetsFromDisk {
renderOpt.TemplateFileSystem = templates.NewTemplateFileSystem("", renderOpt.AppendDirectories[0]) renderOpt.TemplateFileSystem = templates.NewTemplateFileSystem("", customDir)
} }
m.Use(macaron.Renderer(renderOpt)) m.Use(macaron.Renderer(renderOpt))

5
internal/email/email.go
View File

@ -40,9 +40,10 @@ var (
// render renders a mail template with given data. // render renders a mail template with given data.
func render(tpl string, data map[string]any) (string, error) { func render(tpl string, data map[string]any) (string, error) {
tplRenderOnce.Do(func() { tplRenderOnce.Do(func() {
customDir := filepath.Join(conf.CustomDir(), "templates")
opt := &macaron.RenderOptions{ opt := &macaron.RenderOptions{
Directory: filepath.Join(conf.WorkDir(), "templates", "mail"), Directory: filepath.Join(conf.WorkDir(), "templates", "mail"),
AppendDirectories: []string{filepath.Join(conf.CustomDir(), "templates", "mail")}, AppendDirectories: []string{filepath.Join(customDir, "mail")},
Extensions: []string{".tmpl", ".html"}, Extensions: []string{".tmpl", ".html"},
Funcs: []template.FuncMap{map[string]any{ Funcs: []template.FuncMap{map[string]any{
"AppName": func() string { "AppName": func() string {
@ -60,7 +61,7 @@ func render(tpl string, data map[string]any) (string, error) {
}}, }},
} }
if !conf.Server.LoadAssetsFromDisk { if !conf.Server.LoadAssetsFromDisk {
opt.TemplateFileSystem = templates.NewTemplateFileSystem("mail", opt.AppendDirectories[0]) opt.TemplateFileSystem = templates.NewTemplateFileSystem("mail", customDir)
} }
ts := macaron.NewTemplateSet() ts := macaron.NewTemplateSet()