From 78b7529cd471eafefd555fe82b8dbb8b63dcd9f5 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 8 Mar 2021 01:55:57 +0000 Subject: [PATCH] Fix overdue marking of closed issues and milestones (#14923) Closed milestones and issues should only be marked overdue if they were closed after their deadline. Fix: #14536 Signed-off-by: Andrew Thornton --- models/issue.go | 3 +++ models/issue_milestone.go | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/models/issue.go b/models/issue.go index 7ca839102..1b634ed9e 100644 --- a/models/issue.go +++ b/models/issue.go @@ -97,6 +97,9 @@ func (issue *Issue) loadTotalTimes(e Engine) (err error) { // IsOverdue checks if the issue is overdue func (issue *Issue) IsOverdue() bool { + if issue.IsClosed { + return issue.ClosedUnix >= issue.DeadlineUnix + } return timeutil.TimeStampNow() >= issue.DeadlineUnix } diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 5c34834e2..d3d9f7702 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -63,8 +63,10 @@ func (m *Milestone) AfterLoad() { } m.DeadlineString = m.DeadlineUnix.Format("2006-01-02") - if timeutil.TimeStampNow() >= m.DeadlineUnix { - m.IsOverdue = true + if m.IsClosed { + m.IsOverdue = m.ClosedDateUnix >= m.DeadlineUnix + } else { + m.IsOverdue = timeutil.TimeStampNow() >= m.DeadlineUnix } }