Browse Source

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>
tags/v1.15.0-dev
zeripath GitHub 4 years ago
parent
commit
df83c19df1
2 changed files with 7 additions and 2 deletions
  1. +3
    -0
      models/issue.go
  2. +4
    -2
      models/issue_milestone.go

+ 3
- 0
models/issue.go View File

@@ -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
}



+ 4
- 2
models/issue_milestone.go View File

@@ -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
}
}



Loading…
Cancel
Save