Merge pull request #336 from garyburd/master
Display flash messages on not found page
diff --git a/gddo-server/assets/templates/notfound.html b/gddo-server/assets/templates/notfound.html
index 684d208..7a99c38 100644
--- a/gddo-server/assets/templates/notfound.html
+++ b/gddo-server/assets/templates/notfound.html
@@ -1,6 +1,7 @@
{{define "Head"}}<title>Not Found - GoDoc</title>{{end}}
{{define "Body"}}
+ {{template "FlashMessages" .flashMessages}}
<h1>Not Found</h1>
<p>Oh snap! Our team of gophers could not find the web page you are looking for. Try one of these pages:
<ul>
diff --git a/gddo-server/main.go b/gddo-server/main.go
index eea3e12..816971a 100644
--- a/gddo-server/main.go
+++ b/gddo-server/main.go
@@ -745,7 +745,9 @@
func handleError(resp http.ResponseWriter, req *http.Request, status int, err error) {
switch status {
case http.StatusNotFound:
- executeTemplate(resp, "notfound"+templateExt(req), status, nil, nil)
+ executeTemplate(resp, "notfound"+templateExt(req), status, nil, map[string]interface{}{
+ "flashMessages": getFlashMessages(resp, req),
+ })
default:
resp.Header().Set("Content-Type", textMIMEType)
resp.WriteHeader(http.StatusInternalServerError)
