Skip to content

Commit d86aa76

Browse files
committed
Adjust milestone sort order for due date. Non due date mileston will be considered after all due date milestone
1 parent e7d6f74 commit d86aa76

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

models/issues/milestone_list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (opts FindMilestoneOptions) ToConds() builder.Cond {
5959
func (opts FindMilestoneOptions) ToOrders() string {
6060
switch opts.SortType {
6161
case "furthestduedate":
62-
return "deadline_unix DESC"
62+
return "CASE WHEN deadline_unix = 0 THEN 0 ELSE 1 END, deadline_unix DESC, name ASC"
6363
case "leastcomplete":
6464
return "completeness ASC"
6565
case "mostcomplete":
@@ -73,7 +73,7 @@ func (opts FindMilestoneOptions) ToOrders() string {
7373
case "name":
7474
return "name DESC"
7575
default:
76-
return "deadline_unix ASC, name ASC"
76+
return "CASE WHEN deadline_unix = 0 THEN 1 ELSE 0 END, deadline_unix ASC, name ASC"
7777
}
7878
}
7979

0 commit comments

Comments
 (0)