Application: Make error-template title configurable (#40310) (#40363)

* Fix error-template title

as in index-template.html

* Test: fix for AppTitle

Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
(cherry picked from commit 3d9e2d8c82)

Co-authored-by: Ben RUBSON <6764151+benrubson@users.noreply.github.com>

pkg/middleware/recovery.go

@@ -134,10 +134,11 @@ func Recovery(cfg *setting.Cfg) macaron.Handler {
 
 				data := struct {
 					Title     string
+					AppTitle  string
 					AppSubUrl string
 					Theme     string
 					ErrorMsg  string
-				}{"Server Error", cfg.AppSubURL, cfg.DefaultTheme, ""}
+				}{"Server Error", "Grafana", cfg.AppSubURL, cfg.DefaultTheme, ""}
 
 				if setting.Env == setting.Dev {
 					if err, ok := r.(error); ok {

pkg/models/context.go

@@ -30,10 +30,11 @@ type ReqContext struct {
 func (ctx *ReqContext) Handle(cfg *setting.Cfg, status int, title string, err error) {
 	data := struct {
 		Title     string
+		AppTitle  string
 		AppSubUrl string
 		Theme     string
 		ErrorMsg  error
-	}{title, cfg.AppSubURL, "dark", nil}
+	}{title, "Grafana", cfg.AppSubURL, "dark", nil}
 	if err != nil {
 		ctx.Logger.Error(title, "error", err)
 		if setting.Env != setting.Prod {

public/views/error-template.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta name="theme-color" content="#000" />
 
-    <title>Grafana - Error</title>
+    <title>[[.AppTitle]] - Error</title>
 
     <base href="[[.AppSubUrl]]/" />