Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix custom templates being ignored #4638

Merged
merged 1 commit into from
Aug 8, 2018
Merged

Fix custom templates being ignored #4638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions modules/templates/static.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,19 @@ func NewTemplateFileSystem() templateFileSystem {
return fs
}

var tplFileSys = NewTemplateFileSystem()

// HTMLRenderer implements the macaron handler for serving HTML templates.
func HTMLRenderer() macaron.Handler {
return macaron.Renderer(macaron.RenderOptions{
Funcs: NewFuncMap(),
TemplateFileSystem: tplFileSys,
TemplateFileSystem: NewTemplateFileSystem(),
})
}

// JSONRenderer implements the macaron handler for serving JSON templates.
func JSONRenderer() macaron.Handler {
return macaron.Renderer(macaron.RenderOptions{
Funcs: NewFuncMap(),
TemplateFileSystem: tplFileSys,
TemplateFileSystem: NewTemplateFileSystem(),
HTMLContentType: "application/json",
})
}
Expand Down