finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

#2697 fix panic when close issue via commit message

Browse source
This commit is contained in:
Unknwon 2016-02-25 14:17:55 -05:00
parent 4438b7793b
commit 129638117f
7 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
models/action.go
View file

@ -368,7 +368,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
continue
}
if err = issue.ChangeStatus(u, true); err != nil {
if err = issue.ChangeStatus(u, repo, true); err != nil {
return err
}
}
@ -408,7 +408,7 @@ func updateIssuesCommit(u *User, repo *Repository, repoUserName, repoName string
continue
}
if err = issue.ChangeStatus(u, false); err != nil {
if err = issue.ChangeStatus(u, repo, false); err != nil {
return err
}
}

8
models/issue.go
View file

@ -218,7 +218,7 @@ func (i *Issue) ReadBy(uid int64) error {
return UpdateIssueUserByRead(uid, i.ID)
}
func (i *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (err error) {
func (i *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository, isClosed bool) (err error) {
if i.IsClosed == isClosed {
return nil
}
@ -251,7 +251,7 @@ func (i *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (err er
}
// New action comment.
if _, err = createStatusComment(e, doer, i.Repo, i); err != nil {
if _, err = createStatusComment(e, doer, repo, i); err != nil {
return err
}
@ -259,14 +259,14 @@ func (i *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (err er
}
// ChangeStatus changes issue status to open/closed.
func (i *Issue) ChangeStatus(doer *User, isClosed bool) (err error) {
func (i *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (err error) {
sess := x.NewSession()
defer sessionRelease(sess)
if err = sess.Begin(); err != nil {
return err
}
if err = i.changeStatus(sess, doer, isClosed); err != nil {
if err = i.changeStatus(sess, doer, repo, isClosed); err != nil {
return err
}

2
models/pull.go
View file

@ -138,7 +138,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
return err
}
if err = pr.Issue.changeStatus(sess, doer, true); err != nil {
if err = pr.Issue.changeStatus(sess, doer, pr.Issue.Repo, true); err != nil {
return fmt.Errorf("Issue.changeStatus: %v", err)
}