Ver código fonte

Fix failure on creating pull request with assignees (#4419) (#4583)

tags/v1.6.0-dev
SagePtr 5 anos atrás
pai
commit
50ce19eff7
2 arquivos alterados com 7 adições e 3 exclusões
  1. 1
    1
      models/issue.go
  2. 6
    2
      models/issue_assignees.go

+ 1
- 1
models/issue.go Ver arquivo



// Insert the assignees // Insert the assignees
for _, assigneeID := range opts.AssigneeIDs { for _, assigneeID := range opts.AssigneeIDs {
err = opts.Issue.changeAssignee(e, doer, assigneeID)
err = opts.Issue.changeAssignee(e, doer, assigneeID, true)
if err != nil { if err != nil {
return err return err
} }

+ 6
- 2
models/issue_assignees.go Ver arquivo

return err return err
} }


if err := issue.changeAssignee(sess, doer, assigneeID); err != nil {
if err := issue.changeAssignee(sess, doer, assigneeID, false); err != nil {
return err return err
} }


return sess.Commit() return sess.Commit()
} }


func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID int64) (err error) {
func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID int64, isCreate bool) (err error) {


// Update the assignee // Update the assignee
removed, err := updateIssueAssignee(sess, issue, assigneeID) removed, err := updateIssueAssignee(sess, issue, assigneeID)


mode, _ := accessLevel(sess, doer.ID, issue.Repo) mode, _ := accessLevel(sess, doer.ID, issue.Repo)
if issue.IsPull { if issue.IsPull {
// if pull request is in the middle of creation - don't call webhook
if isCreate {
return nil
}
if err = issue.loadPullRequest(sess); err != nil { if err = issue.loadPullRequest(sess); err != nil {
return fmt.Errorf("loadPullRequest: %v", err) return fmt.Errorf("loadPullRequest: %v", err)
} }

Carregando…
Cancelar
Salvar