Skip to content

Commit 5e8a830

Browse files
BElluuGusted
authored andcommitted
[PORT] Added default sorting milestones by name (gitea#27084)
Resolves go-gitea/gitea#26996 Added default sorting for milestones by name. Co-authored-by: Lunny Xiao <[email protected]> --- Conflict resolution: trivial, was due to the improvement made to 'the due date sorting' strings. (cherry picked from commit e8d4b7a8b198eca3b0bd117efb422d7d7cac93fe)
1 parent d405143 commit 5e8a830

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

models/issues/milestone_list.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ func (opts FindMilestoneOptions) ToOrders() string {
7070
return "num_issues DESC"
7171
case "id":
7272
return "id ASC"
73+
case "name":
74+
return "name DESC"
7375
default:
74-
return "deadline_unix ASC, id ASC"
76+
return "deadline_unix ASC, name ASC"
7577
}
7678
}
7779

options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,6 +1996,7 @@ milestones.edit_success = Milestone "%s" has been updated.
19961996
milestones.deletion = Delete milestone
19971997
milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue?
19981998
milestones.deletion_success = The milestone has been deleted.
1999+
milestones.filter_sort.name = Name
19992000
milestones.filter_sort.earliest_due_data = Nearest due date
20002001
milestones.filter_sort.latest_due_date = Farthest due date
20012002
milestones.filter_sort.least_complete = Least complete

templates/repo/issue/milestone/filter_list.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<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>
1212
<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>
1313
<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>
14+
<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>
1415
</div>
1516
</div>

templates/user/dashboard/milestones.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<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>
6666
<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>
6767
<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>
68+
<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>
6869
</div>
6970
</div>
7071
</div>

0 commit comments

Comments
 (0)