test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

fix setMerged for remove unnecessary db connection (#1067)

This commit is contained in:
Lunny Xiao 2017-02-27 08:42:55 +08:00 committed by GitHub
parent 522f194983
commit d4e38cf129
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
models/pull.go
View File

@ -115,11 +115,15 @@ func (pr *PullRequest) LoadAttributes() error {
// LoadIssue loads issue information from database // LoadIssue loads issue information from database
func (pr *PullRequest) LoadIssue() (err error) { func (pr *PullRequest) LoadIssue() (err error) {
return pr.loadIssue(x)
}
func (pr *PullRequest) loadIssue(e Engine) (err error) {
if pr.Issue != nil { if pr.Issue != nil {
return nil return nil
} }
pr.Issue, err = GetIssueByID(pr.IssueID) pr.Issue, err = getIssueByID(e, pr.IssueID)
return err return err
} }
@ -405,14 +409,15 @@ func (pr *PullRequest) setMerged() (err error) {
return err return err
} }
if err = pr.LoadIssue(); err != nil { if err = pr.loadIssue(sess); err != nil {
return err return err
} }
if pr.Issue.Repo.Owner == nil { if err = pr.Issue.loadRepo(sess); err != nil {
if err = pr.Issue.Repo.GetOwner(); err != nil { return err
return err }
} if err = pr.Issue.Repo.getOwner(sess); err != nil {
return err
} }
if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil { if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil {