Skip to content

Commit 1c6c38f

Browse files
yp05327yp05327
authored
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)
1 parent f9e5d98 commit 1c6c38f

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

‎options/locale/locale_en-US.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ issues.delete_branch_at = `deleted branch <b>%s</b> %s`
13841384
issues.filter_label = Label
13851385
issues.filter_label_exclude = `Use <code>alt</code> + <code>click/enter</code> to exclude labels`
13861386
issues.filter_label_no_select = All labels
1387-
issues.filter_label_select_no_label = No Label
1387+
issues.filter_label_select_no_label = No label
13881388
issues.filter_milestone = Milestone
13891389
issues.filter_milestone_all = All milestones
13901390
issues.filter_milestone_none = No milestones

‎routers/web/repo/issue.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
174174
// 0 means issues with no label
175175
// blank means labels will not be filtered for issues
176176
selectLabels := ctx.FormString("labels")
177-
if len(selectLabels) > 0 {
177+
if selectLabels == "" {
178+
ctx.Data["AllLabels"] = true
179+
} else if selectLabels == "0" {
180+
ctx.Data["NoLabel"] = true
181+
} else if len(selectLabels) > 0 {
178182
labelIDs, err = base.StringsToInt64s(strings.Split(selectLabels, ","))
179183
if err != nil {
180184
ctx.ServerError("StringsToInt64s", err)

‎templates/repo/issue/filters.tmpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
</div>
2121
<span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
2222
<div class="divider"></div>
23-
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels=0&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_label_select_no_label"}}</a>
24-
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_label_no_select"}}</a>
23+
<a class="{{if .AllLabels}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_label_no_select"}}</a>
24+
<a class="{{if .NoLabel}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels=0&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_label_select_no_label"}}</a>
2525
{{$previousExclusiveScope := "_no_scope"}}
2626
{{range .Labels}}
2727
{{$exclusiveScope := .ExclusiveScope}}
@@ -84,8 +84,8 @@
8484
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
8585
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_project"}}">
8686
</div>
87-
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_project_all"}}</a>
88-
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&project=-1&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_project_none"}}</a>
87+
<a class="{{if not .ProjectID}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_project_all"}}</a>
88+
<a class="{{if eq .ProjectID -1}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&project=-1&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_project_none"}}</a>
8989
{{if .OpenProjects}}
9090
<div class="divider"></div>
9191
<div class="header">
@@ -141,8 +141,8 @@
141141
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
142142
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignee"}}">
143143
</div>
144-
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee=-1&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_assignee"}}</a>
145-
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a>
144+
<a class="{{if not .AssigneeID}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a>
145+
<a class="{{if eq .AssigneeID -1}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee=-1&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_assignee"}}</a>
146146
<div class="divider"></div>
147147
{{range .Assignees}}
148148
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item gt-df" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{.ID}}&poster={{$.PosterID}}">

0 commit comments

Comments
 (0)