mirror of
https://github.com/filebrowser/filebrowser.git
synced 2024-06-07 23:00:43 +00:00
make a little update
This commit is contained in:
parent
c54dccec17
commit
ad0f5d57fe
@ -165,7 +165,7 @@ func (fi FileInfo) serveSingleFile(w http.ResponseWriter, r *http.Request, c *Co
|
||||
|
||||
templates := []string{"single", "actions", "base"}
|
||||
for _, t := range templates {
|
||||
code, err := page.AddTemplate(t, Asset)
|
||||
code, err := page.AddTemplate(t, Asset, nil)
|
||||
if err != nil {
|
||||
return code, err
|
||||
}
|
||||
@ -228,7 +228,7 @@ func (fi FileInfo) serveListing(w http.ResponseWriter, r *http.Request, c *Confi
|
||||
|
||||
templates := []string{"listing", "actions", "base"}
|
||||
for _, t := range templates {
|
||||
code, err := page.AddTemplate(t, Asset)
|
||||
code, err := page.AddTemplate(t, Asset, nil)
|
||||
if err != nil {
|
||||
return code, err
|
||||
}
|
||||
|
4
page.go
4
page.go
@ -72,7 +72,7 @@ func (p PageInfo) PreviousLink() string {
|
||||
}
|
||||
|
||||
// AddTemplate adds a template file to the page template
|
||||
func (p *Page) AddTemplate(name string, assets AssetFunc) (int, error) {
|
||||
func (p *Page) AddTemplate(name string, assets AssetFunc, functions template.FuncMap) (int, error) {
|
||||
|
||||
// Get the template from the assets
|
||||
page, err := assets("templates/" + name + ".tmpl")
|
||||
@ -86,7 +86,7 @@ func (p *Page) AddTemplate(name string, assets AssetFunc) (int, error) {
|
||||
// If it's the first iteration, creates a new template and add the
|
||||
// functions map
|
||||
if p.Tpl == nil {
|
||||
p.Tpl, err = template.New(name).Parse(string(page))
|
||||
p.Tpl, err = template.New(name).Funcs(functions).Parse(string(page))
|
||||
} else {
|
||||
p.Tpl, err = p.Tpl.Parse(string(page))
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user