diff options
| author | Bartlomiej Komendarczuk <bkomendarczuk@gmail.com> | 2024-07-16 10:08:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-16 10:08:54 +0200 |
| commit | e8d4b7a8b198eca3b0bd117efb422d7d7cac93fe (patch) | |
| tree | fd1f1785ee5eee3743eb53887d4fea4b88f1310a | |
| parent | 0bb4c1cde24052b535de5770e1db3d3279afe32b (diff) | |
| download | gitea-e8d4b7a8b198eca3b0bd117efb422d7d7cac93fe.tar.gz gitea-e8d4b7a8b198eca3b0bd117efb422d7d7cac93fe.zip | |
Added default sorting milestones by name (#27084)
#26996
Added default sorting for milestones by name.
Additional, name for sorting closestduedate and furthestduedate was
broken, so I fixed it.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
| -rw-r--r-- | models/issues/milestone_list.go | 4 | ||||
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 | ||||
| -rw-r--r-- | templates/repo/issue/milestone/filter_list.tmpl | 1 | ||||
| -rw-r--r-- | templates/user/dashboard/milestones.tmpl | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/models/issues/milestone_list.go b/models/issues/milestone_list.go index d1b3f0301b..955ab2356d 100644 --- a/models/issues/milestone_list.go +++ b/models/issues/milestone_list.go @@ -70,8 +70,10 @@ func (opts FindMilestoneOptions) ToOrders() string { return "num_issues DESC" case "id": return "id ASC" + case "name": + return "name DESC" default: - return "deadline_unix ASC, id ASC" + return "deadline_unix ASC, name ASC" } } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ef9e946c0a..95e8cd5b2e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1935,6 +1935,7 @@ milestones.edit_success = Milestone "%s" has been updated. milestones.deletion = Delete Milestone milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue? milestones.deletion_success = The milestone has been deleted. +milestones.filter_sort.name = Name milestones.filter_sort.earliest_due_data = Earliest due date milestones.filter_sort.latest_due_date = Latest due date milestones.filter_sort.least_complete = Least complete diff --git a/templates/repo/issue/milestone/filter_list.tmpl b/templates/repo/issue/milestone/filter_list.tmpl index 45f9866a16..430d3814ee 100644 --- a/templates/repo/issue/milestone/filter_list.tmpl +++ b/templates/repo/issue/milestone/filter_list.tmpl @@ -11,5 +11,6 @@ <a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="?sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.most_complete"}}</a> <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="?sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="?sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> + <a class="{{if eq .SortType "name"}}active {{end}}item" href="{{$.Link}}?sort=name&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.name"}}</a> </div> </div> diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 0f1e866a21..71ff8dba3f 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -65,6 +65,7 @@ <a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.most_complete"}}</a> <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> + <a class="{{if eq .SortType "name"}}active {{end}}item" href="{{$.Link}}?sort=name&state={{$.State}}&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.milestones.filter_sort.name"}}</a> </div> </div> </div> |