From e8d4b7a8b198eca3b0bd117efb422d7d7cac93fe Mon Sep 17 00:00:00 2001 From: Bartlomiej Komendarczuk Date: Tue, 16 Jul 2024 10:08:54 +0200 Subject: [PATCH] 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 --- models/issues/milestone_list.go | 4 +++- options/locale/locale_en-US.ini | 1 + templates/repo/issue/milestone/filter_list.tmpl | 1 + templates/user/dashboard/milestones.tmpl | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/models/issues/milestone_list.go b/models/issues/milestone_list.go index d1b3f0301..955ab2356 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 ef9e946c0..95e8cd5b2 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 45f9866a1..430d3814e 100644 --- a/templates/repo/issue/milestone/filter_list.tmpl +++ b/templates/repo/issue/milestone/filter_list.tmpl @@ -11,5 +11,6 @@ {{ctx.Locale.Tr "repo.milestones.filter_sort.most_complete"}} {{ctx.Locale.Tr "repo.milestones.filter_sort.most_issues"}} {{ctx.Locale.Tr "repo.milestones.filter_sort.least_issues"}} + {{ctx.Locale.Tr "repo.milestones.filter_sort.name"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 0f1e866a2..71ff8dba3 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -65,6 +65,7 @@ {{ctx.Locale.Tr "repo.milestones.filter_sort.most_complete"}} {{ctx.Locale.Tr "repo.milestones.filter_sort.most_issues"}} {{ctx.Locale.Tr "repo.milestones.filter_sort.least_issues"}} + {{ctx.Locale.Tr "repo.milestones.filter_sort.name"}}