From 1c6c38fa6eae2efd35d38b78385d37fba92a93e2 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Wed, 26 Jul 2023 22:00:50 +0900
Subject: [PATCH] Improve display of Labels/Projects/Assignees sort options
(#25886)
Labels:
Before: (no highlights)
![image](https://github.com/go-gitea/gitea/assets/18380374/88ffbff0-1b14-4d93-810d-f2ce2b2d7321)
After:
![image](https://github.com/go-gitea/gitea/assets/18380374/ab7b665b-d17c-4acd-a681-64cbb67ae460)
![image](https://github.com/go-gitea/gitea/assets/18380374/19f8a0d0-ad5f-4dbf-b45a-1001e60a8399)
Projects:
Before: (no highlights)
![image](https://github.com/go-gitea/gitea/assets/18380374/2079e6a8-8801-4662-acda-e248f115462f)
After:
![image](https://github.com/go-gitea/gitea/assets/18380374/7180a086-68be-49c4-bb29-3d05454fb41d)
![image](https://github.com/go-gitea/gitea/assets/18380374/3c5a791f-1852-4957-89b8-10940c672e10)
Assignee:
Before: (no highlights)
![image](https://github.com/go-gitea/gitea/assets/18380374/09273636-d9b1-4144-9533-2ce66cab8c49)
After:
![image](https://github.com/go-gitea/gitea/assets/18380374/24bd0cfe-b589-4c8a-be67-74f242dda6d3)
![image](https://github.com/go-gitea/gitea/assets/18380374/7476be73-5201-4330-82e2-44b0b5080f71)
---
options/locale/locale_en-US.ini | 2 +-
routers/web/repo/issue.go | 6 +++++-
templates/repo/issue/filters.tmpl | 12 ++++++------
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a76750e44..25fb15543 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1384,7 +1384,7 @@ issues.delete_branch_at = `deleted branch %s %s`
issues.filter_label = Label
issues.filter_label_exclude = `Use alt
+ click/enter
to exclude labels`
issues.filter_label_no_select = All labels
-issues.filter_label_select_no_label = No Label
+issues.filter_label_select_no_label = No label
issues.filter_milestone = Milestone
issues.filter_milestone_all = All milestones
issues.filter_milestone_none = No milestones
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index f5cec5a32..f243507c3 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -174,7 +174,11 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
// 0 means issues with no label
// blank means labels will not be filtered for issues
selectLabels := ctx.FormString("labels")
- if len(selectLabels) > 0 {
+ if selectLabels == "" {
+ ctx.Data["AllLabels"] = true
+ } else if selectLabels == "0" {
+ ctx.Data["NoLabel"] = true
+ } else if len(selectLabels) > 0 {
labelIDs, err = base.StringsToInt64s(strings.Split(selectLabels, ","))
if err != nil {
ctx.ServerError("StringsToInt64s", err)
diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl
index edc483d75..b75d98ed6 100644
--- a/templates/repo/issue/filters.tmpl
+++ b/templates/repo/issue/filters.tmpl
@@ -20,8 +20,8 @@
{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}