Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use milestone deadline when sorting issues #14551

Merged
merged 5 commits into from
Jun 15, 2021
Merged

Use milestone deadline when sorting issues #14551

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3e76bf
Use milestone deadline when sorting issues
koalp Nov 28, 2020
4960924
Merge branch 'main' into feature/sort_issue_by_milestone_deadline
techknowlogick May 21, 2021
e33c531
Merge branch 'main' into feature/sort_issue_by_milestone_deadline
lunny May 22, 2021
31aa367
Merge branch 'main' into feature/sort_issue_by_milestone_deadline
lunny May 24, 2021
cd741db
Merge branch 'main' into feature/sort_issue_by_milestone_deadline
techknowlogick Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions models/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,9 +1127,18 @@ func sortIssuesSession(sess *xorm.Session, sortType string, priorityRepoID int64
sess.Desc("issue.priority")
case "nearduedate":
// 253370764800 is 01/01/9999 @ 12:00am (UTC)
sess.OrderBy("CASE WHEN issue.deadline_unix = 0 THEN 253370764800 ELSE issue.deadline_unix END ASC")
sess.Join("LEFT", "milestone", "issue.milestone_id = milestone.id").
OrderBy("CASE " +
"WHEN issue.deadline_unix = 0 AND (milestone.deadline_unix = 0 OR milestone.deadline_unix IS NULL) THEN 253370764800 " +
"WHEN milestone.deadline_unix = 0 OR milestone.deadline_unix IS NULL THEN issue.deadline_unix " +
"WHEN milestone.deadline_unix < issue.deadline_unix OR issue.deadline_unix = 0 THEN milestone.deadline_unix " +
"ELSE issue.deadline_unix END ASC")
case "farduedate":
sess.Desc("issue.deadline_unix")
sess.Join("LEFT", "milestone", "issue.milestone_id = milestone.id").
OrderBy("CASE " +
"WHEN milestone.deadline_unix IS NULL THEN issue.deadline_unix " +
"WHEN milestone.deadline_unix < issue.deadline_unix OR issue.deadline_unix = 0 THEN milestone.deadline_unix " +
"ELSE issue.deadline_unix END DESC")
case "priorityrepo":
sess.OrderBy("CASE WHEN issue.repo_id = " + strconv.FormatInt(priorityRepoID, 10) + " THEN 1 ELSE 2 END, issue.created_unix DESC")
default:
Expand Down