diff --git a/modules/templates/helper.go b/modules/templates/helper.go index deaa9526be..c3c92f856b 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -269,6 +269,14 @@ func NewFuncMap() []template.FuncMap { return "" } }, + "contain": func(s []int64, id int64) bool { + for i := 0; i < len(s); i++ { + if s[i] == id { + return true + } + } + return false + }, }} } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 4810eecdc6..67c4ee3788 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -264,7 +264,8 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB } ctx.Data["IssueStats"] = issueStats - ctx.Data["SelectLabels"] = com.StrTo(selectLabels).MustInt64() + ctx.Data["SelLabelIDs"] = labelIDs + ctx.Data["SelectLabels"] = selectLabels ctx.Data["ViewType"] = viewType ctx.Data["SortType"] = sortType ctx.Data["MilestoneID"] = milestoneID diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 41f90b1c13..d280878f2e 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -155,7 +155,7 @@ diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index ad3f0b5c86..fb0609601c 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -61,7 +61,7 @@ {{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}} {{.i18n.Tr "repo.issues.filter_label_no_select"}} {{range .Labels}} - {{.Name}} + {{.Name}} {{end}} @@ -149,7 +149,7 @@