peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed redundant depExists

Browse Source 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
This commit is contained in:
Konrad Langenberg 2017-09-17 21:37:11 +02:00 committed by Konrad
parent fe6c1a9ae2
commit 29624e58f3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
models/issue_dependency.go
View File

@ -43,19 +43,19 @@ func (iw *IssueDependency) BeforeUpdate() {
} }
// CreateIssueDependency creates a new dependency for an issue // CreateIssueDependency creates a new dependency for an issue
func CreateIssueDependency(user *User, issue, dep *Issue) (err error, exists bool, depExists bool) { func CreateIssueDependency(user *User, issue, dep *Issue) (err error, exists bool) {
sess := x.NewSession() sess := x.NewSession()
// TODO: Move this to the appropriate place // TODO: Move this to the appropriate place
err = x.Sync(new(IssueDependency)) err = x.Sync(new(IssueDependency))
if err != nil { if err != nil {
return err, exists, false return err, exists
} }
// Check if it aleready exists // Check if it aleready exists
exists, err = issueDepExists(x, issue.ID, dep.ID) exists, err = issueDepExists(x, issue.ID, dep.ID)
if err != nil { if err != nil {
return err, exists, false return err, exists
} }
// If it not exists, create it, otherwise show an error message // If it not exists, create it, otherwise show an error message
@ -66,24 +66,24 @@ func CreateIssueDependency(user *User, issue, dep *Issue) (err error, exists boo
newId.DependencyID = dep.ID newId.DependencyID = dep.ID
if _, err := x.Insert(newId); err != nil { if _, err := x.Insert(newId); err != nil {
return err, exists, false return err, exists
} }
// Add comment referencing the new dependency // Add comment referencing the new dependency
_, err = createIssueDependencyComment(sess, user, issue, dep, true) _, err = createIssueDependencyComment(sess, user, issue, dep, true)
if err != nil { if err != nil {
return err, exists, false return err, exists
} }
// Create a new comment for the dependent issue // Create a new comment for the dependent issue
_, err = createIssueDependencyComment(sess, user, dep, issue, true) _, err = createIssueDependencyComment(sess, user, dep, issue, true)
if err != nil { if err != nil {
return err, exists, false return err, exists
} }
} }
return nil, exists, false return nil, exists
} }
// Removes a dependency from an issue // Removes a dependency from an issue
@ -154,10 +154,10 @@ func issueDepExists(e Engine, issueID int64, depID int64) (exists bool, err erro
} }
// check if issue can be closed // check if issue can be closed
func IssueNoDependenciesLeft(issueID int64) bool { func IssueNoDependenciesLeft(issue *Issue) bool {
var issueDeps []IssueDependency var issueDeps []IssueDependency
err := x.Where("issue_id = ?", issueID).Find(&issueDeps) err := x.Where("issue_id = ?", issue.ID).Find(&issueDeps)
for _, issueDep := range issueDeps { for _, issueDep := range issueDeps {
issueDetails, _ := getIssueByID(x, issueDep.DependencyID) issueDetails, _ := getIssueByID(x, issueDep.DependencyID)