fix bug

models/action.go

@@ -506,7 +506,8 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
  continue
  }
 
- if err = issue.ChangeStatus(doer, repo, true); err != nil {
+ issue.Repo = repo
+ if err = issue.ChangeStatus(doer, true); err != nil {
  // Don't return an error when dependencies are open as this would let the push fail
  if IsErrDependenciesLeft(err) {
  return nil
@@ -531,7 +532,8 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
  continue
  }
 
- if err = issue.ChangeStatus(doer, repo, false); err != nil {
+ issue.Repo = repo
+ if err = issue.ChangeStatus(doer, false); err != nil {
  return err
  }
  }

models/issue.go

@@ -664,7 +664,7 @@ func UpdateIssueCols(issue *Issue, cols ...string) error {
  return updateIssueCols(x, issue, cols...)
 }
 
-func (issue *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository, isClosed bool) (err error) {
+func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (err error) {
  // Nothing should be performed if current status is same as target status
  if issue.IsClosed == isClosed {
  return nil
@@ -715,22 +715,26 @@ func (issue *Issue) changeStatus(e *xorm.Session, doer *User, repo *Repository,
  }
 
  // New action comment
- if _, err = createStatusComment(e, doer, repo, issue); err != nil {
+ if _, err = createStatusComment(e, doer, issue); err != nil {
  return err
  }
 
  return nil
 }
 
 // ChangeStatus changes issue status to open or closed.
-func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (err error) {
+func (issue *Issue) ChangeStatus(doer *User, isClosed bool) (err error) {
  sess := x.NewSession()
  defer sess.Close()
  if err = sess.Begin(); err != nil {
  return err
  }
 
- if err = issue.changeStatus(sess, doer, repo, isClosed); err != nil {
+ if err = issue.loadRepo(sess); err != nil {
+ return err
+ }
+
+ if err = issue.changeStatus(sess, doer, isClosed); err != nil {
  return err
  }
 
@@ -746,33 +750,33 @@ func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (e
  apiPullRequest := &api.PullRequestPayload{
  Index: issue.Index,
  PullRequest: issue.PullRequest.APIFormat(),
- Repository: repo.APIFormat(mode),
+ Repository: issue.Repo.APIFormat(mode),
  Sender: doer.APIFormat(),
  }
  if isClosed {
  apiPullRequest.Action = api.HookIssueClosed
  } else {
  apiPullRequest.Action = api.HookIssueReOpened
  }
- err = PrepareWebhooks(repo, HookEventPullRequest, apiPullRequest)
+ err = PrepareWebhooks(issue.Repo, HookEventPullRequest, apiPullRequest)
  } else {
  apiIssue := &api.IssuePayload{
  Index: issue.Index,
  Issue: issue.APIFormat(),
- Repository: repo.APIFormat(mode),
+ Repository: issue.Repo.APIFormat(mode),
  Sender: doer.APIFormat(),
  }
  if isClosed {
  apiIssue.Action = api.HookIssueClosed
  } else {
  apiIssue.Action = api.HookIssueReOpened
  }
- err = PrepareWebhooks(repo, HookEventIssues, apiIssue)
+ err = PrepareWebhooks(issue.Repo, HookEventIssues, apiIssue)
  }
  if err != nil {
  log.Error(4, "PrepareWebhooks [is_pull: %v, is_closed: %v]: %v", issue.IsPull, isClosed, err)
  } else {
- go HookQueue.Add(repo.ID)
+ go HookQueue.Add(issue.Repo.ID)
  }
 
  return nil

models/issue_comment.go

@@ -617,15 +617,15 @@ func sendCreateCommentAction(e *xorm.Session, opts *CreateCommentOptions, commen
  return nil
 }
 
-func createStatusComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue) (*Comment, error) {
+func createStatusComment(e *xorm.Session, doer *User, issue *Issue) (*Comment, error) {
  cmtType := CommentTypeClose
  if !issue.IsClosed {
  cmtType = CommentTypeReopen
  }
  return createComment(e, &CreateCommentOptions{
  Type: cmtType,
  Doer: doer,
- Repo: repo,
+ Repo: issue.Repo,
  Issue: issue,
  })
 }

models/pull.go

@@ -535,7 +535,7 @@ func (pr *PullRequest) setMerged() (err error) {
  return err
  }
 
- if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil {
+ if err = pr.Issue.changeStatus(sess, pr.Merger, true); err != nil {
  return fmt.Errorf("Issue.changeStatus: %v", err)
  }
  if _, err = sess.ID(pr.ID).Cols("has_merged, status, merged_commit_id, merger_id, merged_unix").Update(pr); err != nil {

routers/api/v1/repo/issue.go

@@ -175,6 +175,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
 
  issue := &models.Issue{
  RepoID: ctx.Repo.Repository.ID,
+ Repo: ctx.Repo.Repository,
  Title: form.Title,
  PosterID: ctx.User.ID,
  Poster: ctx.User,
@@ -212,7 +213,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
  notification.NotifyNewIssue(issue)
 
  if form.Closed {
- if err := issue.ChangeStatus(ctx.User, ctx.Repo.Repository, true); err != nil {
+ if err := issue.ChangeStatus(ctx.User, true); err != nil {
  if models.IsErrDependenciesLeft(err) {
  ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this issue because it still has open dependencies")
  return
@@ -273,6 +274,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
  }
  return
  }
+ issue.Repo = ctx.Repo.Repository
 
  if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.CanWrite(models.UnitTypeIssues) {
  ctx.Status(403)
@@ -333,7 +335,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
  return
  }
  if form.State != nil {
- if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, api.StateClosed == api.StateType(*form.State)); err != nil {
+ if err = issue.ChangeStatus(ctx.User, api.StateClosed == api.StateType(*form.State)); err != nil {
  if models.IsErrDependenciesLeft(err) {
  ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this issue because it still has open dependencies")
  return

routers/api/v1/repo/pull.go

@@ -350,6 +350,7 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
 
  pr.LoadIssue()
  issue := pr.Issue
+ issue.Repo = ctx.Repo.Repository
 
  if !issue.IsPoster(ctx.User.ID) && !ctx.Repo.CanWrite(models.UnitTypePullRequests) {
  ctx.Status(403)
@@ -383,7 +384,6 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
  // Send an empty array ([]) to clear all assignees from the Issue.
 
  if ctx.Repo.CanWrite(models.UnitTypePullRequests) && (form.Assignees != nil || len(form.Assignee) > 0) {
-
  err = models.UpdateAPIAssignee(issue, form.Assignee, form.Assignees, ctx.User)
  if err != nil {
  if models.IsErrUserNotExist(err) {
@@ -422,7 +422,7 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
  return
  }
  if form.State != nil {
- if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, api.StateClosed == api.StateType(*form.State)); err != nil {
+ if err = issue.ChangeStatus(ctx.User, api.StateClosed == api.StateType(*form.State)); err != nil {
  if models.IsErrDependenciesLeft(err) {
  ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this pull request because it still has open dependencies")
  return

routers/repo/issue.go

@@ -874,6 +874,7 @@ func GetActionIssue(ctx *context.Context) *models.Issue {
  ctx.NotFoundOrServerError("GetIssueByIndex", models.IsErrIssueNotExist, err)
  return nil
  }
+ issue.Repo = ctx.Repo.Repository
  checkIssueRights(ctx, issue)
  if ctx.Written() {
  return nil
@@ -1055,7 +1056,7 @@ func UpdateIssueStatus(ctx *context.Context) {
  }
  for _, issue := range issues {
  if issue.IsClosed != isClosed {
- if err := issue.ChangeStatus(ctx.User, issue.Repo, isClosed); err != nil {
+ if err := issue.ChangeStatus(ctx.User, isClosed); err != nil {
  if models.IsErrDependenciesLeft(err) {
  ctx.JSON(http.StatusPreconditionFailed, map[string]interface{}{
  "error": "cannot close this issue because it still has open dependencies",
@@ -1132,7 +1133,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
  ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index))
  } else {
  isClosed := form.Status == "close"
- if err := issue.ChangeStatus(ctx.User, ctx.Repo.Repository, isClosed); err != nil {
+ if err := issue.ChangeStatus(ctx.User, isClosed); err != nil {
  log.Error(4, "ChangeStatus: %v", err)
 
  if models.IsErrDependenciesLeft(err) {