Simplified checking for circular dependencies

This commit is contained in:
kolaente 2018-04-20 22:45:59 +02:00
parent d0b7307468
commit 17b2d43a4d
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B

View File

@ -46,7 +46,7 @@ func CreateIssueDependency(user *User, issue, dep *Issue) (err error) {
return ErrDependencyExists{issue.ID, dep.ID}
}
// And if it would be circular
circular, err := issueDepIsCircular(sess, issue.ID, dep.ID)
circular, err := issueDepExists(sess, dep.ID, issue.ID)
if err != nil {
return err
}
@ -137,12 +137,6 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro
return
}
// Checks if a dependency is circular
func issueDepIsCircular(e Engine, issueID int64, depID int64) (circular bool, err error) {
circular, err = e.Where("issue_id = ? AND dependency_id = ?", depID, issueID).Exist(&IssueDependency{})
return
}
// IssueNoDependenciesLeft checks if issue can be closed
func IssueNoDependenciesLeft(issue *Issue) (bool, error) {