Fix mail template error (#29410)

wxiaoguang · web-flow · commit eb2fc1818b00 · 2024-02-26T22:31:30.000Z
diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go
@@ -44,11 +44,17 @@ func buildSubjectBodyTemplate(stpl *texttmpl.Template, btpl *template.Template,
 	}
 	if _, err := stpl.New(name).
 		Parse(string(subjectContent)); err != nil {
-		log.Warn("Failed to parse template [%s/subject]: %v", name, err)
+		log.Error("Failed to parse template [%s/subject]: %v", name, err)
+		if !setting.IsProd {
+			log.Fatal("Please fix the mail template error")
+		}
 	}
 	if _, err := btpl.New(name).
 		Parse(string(bodyContent)); err != nil {
-		log.Warn("Failed to parse template [%s/body]: %v", name, err)
+		log.Error("Failed to parse template [%s/body]: %v", name, err)
+		if !setting.IsProd {
+			log.Fatal("Please fix the mail template error")
+		}
 	}
 }
 
diff --git a/templates/mail/notify/repo_transfer.tmpl b/templates/mail/notify/repo_transfer.tmpl
@@ -5,7 +5,7 @@
 	<title>{{.Subject}}</title>
 </head>
 
-{{$url := HTMLFormat "<a href='%[1]s'>%[2]s</a>" .Link .Repo)}}
+{{$url := HTMLFormat "<a href='%[1]s'>%[2]s</a>" .Link .Repo}}
 <body>
 	<p>{{.Subject}}.
 		{{.locale.Tr "mail.repo.transfer.body" $url}}

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,17 @@ func buildSubjectBodyTemplate(stpl texttmpl.Template, btpl template.Template,`
`44`	`44`	`}`
`45`	`45`	`if _, err := stpl.New(name).`
`46`	`46`	`Parse(string(subjectContent)); err != nil {`
`47`		`- log.Warn("Failed to parse template [%s/subject]: %v", name, err)`
	`47`	`+ log.Error("Failed to parse template [%s/subject]: %v", name, err)`
	`48`	`+ if !setting.IsProd {`
	`49`	`+ log.Fatal("Please fix the mail template error")`
	`50`	`+ }`
`48`	`51`	`}`
`49`	`52`	`if _, err := btpl.New(name).`
`50`	`53`	`Parse(string(bodyContent)); err != nil {`
`51`		`- log.Warn("Failed to parse template [%s/body]: %v", name, err)`
	`54`	`+ log.Error("Failed to parse template [%s/body]: %v", name, err)`
	`55`	`+ if !setting.IsProd {`
	`56`	`+ log.Fatal("Please fix the mail template error")`
	`57`	`+ }`
`52`	`58`	`}`
`53`	`59`	`}`
`54`	`60`