mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-22 17:34:03 +03:00
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 <art27@cantab.net>
This commit is contained in:
parent
09fe0abb32
commit
78b7529cd4
@ -97,6 +97,9 @@ func (issue *Issue) loadTotalTimes(e Engine) (err error) {
|
|||||||
|
|
||||||
// IsOverdue checks if the issue is overdue
|
// IsOverdue checks if the issue is overdue
|
||||||
func (issue *Issue) IsOverdue() bool {
|
func (issue *Issue) IsOverdue() bool {
|
||||||
|
if issue.IsClosed {
|
||||||
|
return issue.ClosedUnix >= issue.DeadlineUnix
|
||||||
|
}
|
||||||
return timeutil.TimeStampNow() >= issue.DeadlineUnix
|
return timeutil.TimeStampNow() >= issue.DeadlineUnix
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,8 +63,10 @@ func (m *Milestone) AfterLoad() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
m.DeadlineString = m.DeadlineUnix.Format("2006-01-02")
|
m.DeadlineString = m.DeadlineUnix.Format("2006-01-02")
|
||||||
if timeutil.TimeStampNow() >= m.DeadlineUnix {
|
if m.IsClosed {
|
||||||
m.IsOverdue = true
|
m.IsOverdue = m.ClosedDateUnix >= m.DeadlineUnix
|
||||||
|
} else {
|
||||||
|
m.IsOverdue = timeutil.TimeStampNow() >= m.DeadlineUnix
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user