From f27e56a26121d25ce0aa341948bdddf0e24929b1 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 13 Sep 2022 14:12:06 +0200 Subject: [PATCH 1/2] Show label description in comments section --- modules/templates/helper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 2879d68e3b888..17190fb5be5ca 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -383,8 +383,8 @@ func NewFuncMap() []template.FuncMap { if label == nil { continue } - html += fmt.Sprintf("%s ", - repoLink, label.ID, label.ForegroundColor(), label.Color, RenderEmoji(label.Name)) + html += fmt.Sprintf("%s ", + repoLink, label.ID, label.ForegroundColor(), label.Color, label.Description, RenderEmoji(label.Name)) } html += "" return template.HTML(html) From 9486b291f1f7bd46f6c07acbc2e0561af0edb2c0 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Thu, 15 Sep 2022 13:38:25 +0200 Subject: [PATCH 2/2] Use html.EscapeString(() --- modules/templates/helper.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 17190fb5be5ca..a8e4075248dd8 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -377,17 +377,17 @@ func NewFuncMap() []template.FuncMap { return "" }, "RenderLabels": func(labels []*issues_model.Label, repoLink string) template.HTML { - html := `` + htmlCode := `` for _, label := range labels { // Protect against nil value in labels - shouldn't happen but would cause a panic if so if label == nil { continue } - html += fmt.Sprintf("%s ", - repoLink, label.ID, label.ForegroundColor(), label.Color, label.Description, RenderEmoji(label.Name)) + htmlCode += fmt.Sprintf("%s ", + repoLink, label.ID, label.ForegroundColor(), label.Color, html.EscapeString(label.Description), RenderEmoji(label.Name)) } - html += "" - return template.HTML(html) + htmlCode += "" + return template.HTML(htmlCode) }, "MermaidMaxSourceCharacters": func() int { return setting.MermaidMaxSourceCharacters