ch5.4
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -16,11 +17,15 @@ func (app *application) render(w http.ResponseWriter, status int, page string, d
|
|||||||
app.serverError(w, err)
|
app.serverError(w, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
w.WriteHeader(status)
|
buf := new(bytes.Buffer)
|
||||||
err := ts.ExecuteTemplate(w, "base", data)
|
|
||||||
|
err := ts.ExecuteTemplate(buf, "base", data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
app.serverError(w, err)
|
app.serverError(w, err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
w.WriteHeader(status)
|
||||||
|
buf.WriteTo(w)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (app *application) home(w http.ResponseWriter, r *http.Request) {
|
func (app *application) home(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ func newTemplateCache() (map[string]*template.Template, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
ts, err = ts.ParseGlob("./ui/html/pages/nav.tmpl")
|
ts, err = ts.ParseGlob("./ui/html/partials/nav.tmpl")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user