TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 00:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix close issue but time watcher still running (#17643)

Browse Source 
* Fix close issue but time watcher still running

* refactor stopwatch codes

* Fix test

* Fix test

* Fix typo

* Fix test
This commit is contained in:
Lunny Xiao
2021-11-21 17:11:48 +08:00
committed by GitHub
parent ab09296d37
commit 0add627182
6 changed files with 159 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/issue/status.go
View File

@@ -6,16 +6,30 @@ package issue
import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/notification"
)
// ChangeStatus changes issue status to open or closed.
func ChangeStatus(issue *models.Issue, doer *models.User, isClosed bool) (err error) {
comment, err := issue.ChangeStatus(doer, isClosed)
func ChangeStatus(issue *models.Issue, doer *models.User, closed bool) error {
comment, err := issue.ChangeStatus(doer, closed)
if err != nil {
return
// Don't return an error when dependencies are open as this would let the push fail
if models.IsErrDependenciesLeft(err) {
if closed {
return models.FinishIssueStopwatchIfPossible(db.DefaultContext, doer, issue)
}
}
return err
}
notification.NotifyIssueChangeStatus(doer, issue, comment, isClosed)
if closed {
if err := models.FinishIssueStopwatchIfPossible(db.DefaultContext, doer, issue); err != nil {
return err
}
}
notification.NotifyIssueChangeStatus(doer, issue, comment, closed)
return nil
}