Merge 4666bc17e453bef4d676e151fecd79392b51ff16 into c5d74e586992fcd286064c3d97461ded050c4604

Merge branch 'main' into lunny/milestone_order_due_date
2025-10-03 00:02:14 -04:00 · 2025-10-01 02:31:46 +02:00 · 2025-09-07 09:47:15 +02:00 · 2025-09-04 21:30:32 -07:00 · 2025-08-01 21:50:00 -07:00 · 2025-08-01 16:23:46 -07:00
2 changed files with 3 additions and 3 deletions
--- a/models/issues/milestone_list.go
+++ b/models/issues/milestone_list.go
@ -59,7 +59,7 @@ func (opts FindMilestoneOptions) ToConds() builder.Cond {
 func (opts FindMilestoneOptions) ToOrders() string {
 	switch opts.SortType {
 	case "furthestduedate":
-		return "deadline_unix DESC"
+		return "CASE WHEN deadline_unix = 0 OR deadline_unix IS NULL THEN 0 ELSE 1 END, deadline_unix DESC, name ASC"
 	case "leastcomplete":
 		return "completeness ASC"
 	case "mostcomplete":
@ -73,7 +73,7 @@ func (opts FindMilestoneOptions) ToOrders() string {
 	case "name":
 		return "name DESC"
 	default:
-		return "deadline_unix ASC, name ASC"
+		return "CASE WHEN deadline_unix = 0 OR deadline_unix IS NULL THEN 1 ELSE 0 END, deadline_unix ASC, name ASC"
 	}
 }

--- a/tests/integration/api_issue_milestone_test.go
+++ b/tests/integration/api_issue_milestone_test.go
@ -67,7 +67,7 @@ func TestAPIIssuesMilestone(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiMilestones)
 	assert.Len(t, apiMilestones, 4)
-	assert.Nil(t, apiMilestones[0].Deadline)
+	assert.Nil(t, apiMilestones[3].Deadline)

 	req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%s", owner.Name, repo.Name, apiMilestones[2].Title)).
 		AddTokenAuth(token)
Author	SHA1	Message	Date
Lunny Xiao	67c98f4d73	Merge 4666bc17e453bef4d676e151fecd79392b51ff16 into c5d74e586992fcd286064c3d97461ded050c4604	2025-10-01 02:31:46 +02:00
6543	4666bc17e4	Merge branch 'main' into lunny/milestone_order_due_date	2025-09-07 09:47:15 +02:00
Lunny Xiao	d91604ed2f	Merge branch 'main' into lunny/milestone_order_due_date	2025-09-04 21:30:32 -07:00
Lunny Xiao	1bafbb643d	Consider deadline_unix might be NULL	2025-08-01 21:50:00 -07:00
Lunny Xiao	d86aa76640	Adjust milestone sort order for due date. Non due date mileston will be considered after all due date milestone	2025-08-01 16:23:46 -07:00