Parcourir la source

tmp: fix issue open count

Unknwon il y a 9 ans
Parent
commit
5da306c0e5
2 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 3 4
      models/issue.go
  2. 2 1
      routers/repo/pull.go

+ 3 - 4
models/issue.go

@@ -903,16 +903,15 @@ func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
 }
 
 // Merge merges pull request to base repository.
-func (pr *PullRequest) Merge(baseGitRepo *git.Repository) (err error) {
+func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error) {
 	sess := x.NewSession()
 	defer sessionRelease(sess)
 	if err = sess.Begin(); err != nil {
 		return err
 	}
 
-	pr.Pull.IsClosed = true
-	if _, err = sess.Id(pr.Pull.ID).AllCols().Update(pr.Pull); err != nil {
-		return fmt.Errorf("update pull: %v", err)
+	if err = pr.Pull.changeStatus(sess, doer, true); err != nil {
+		return fmt.Errorf("Pull.changeStatus: %v", err)
 	}
 
 	headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)

+ 2 - 1
routers/repo/pull.go

@@ -381,7 +381,8 @@ func MergePullRequest(ctx *middleware.Context) {
 	}
 
 	pr.Pull = pull
-	if err = pr.Merge(ctx.Repo.GitRepo); err != nil {
+	pr.Pull.Repo = ctx.Repo.Repository
+	if err = pr.Merge(ctx.User, ctx.Repo.GitRepo); err != nil {
 		ctx.Handle(500, "GetPullRequestByPullID", err)
 		return
 	}