|
|
@ -11,8 +11,6 @@ import ( |
|
|
|
"code.gitea.io/gitea/modules/auth" |
|
|
|
"code.gitea.io/gitea/modules/auth" |
|
|
|
"code.gitea.io/gitea/modules/context" |
|
|
|
"code.gitea.io/gitea/modules/context" |
|
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
"code.gitea.io/gitea/modules/notification" |
|
|
|
|
|
|
|
comment_service "code.gitea.io/gitea/services/comments" |
|
|
|
|
|
|
|
pull_service "code.gitea.io/gitea/services/pull" |
|
|
|
pull_service "code.gitea.io/gitea/services/pull" |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
@ -31,64 +29,33 @@ func CreateCodeComment(ctx *context.Context, form auth.CodeCommentForm) { |
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
var comment *models.Comment |
|
|
|
|
|
|
|
defer func() { |
|
|
|
|
|
|
|
if comment != nil { |
|
|
|
|
|
|
|
ctx.Redirect(comment.HTMLURL()) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}() |
|
|
|
|
|
|
|
signedLine := form.Line |
|
|
|
signedLine := form.Line |
|
|
|
if form.Side == "previous" { |
|
|
|
if form.Side == "previous" { |
|
|
|
signedLine *= -1 |
|
|
|
signedLine *= -1 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
review := new(models.Review) |
|
|
|
comment, err := pull_service.CreateCodeComment( |
|
|
|
if form.IsReview { |
|
|
|
|
|
|
|
var err error |
|
|
|
|
|
|
|
// Check if the user has already a pending review for this issue
|
|
|
|
|
|
|
|
if review, err = models.GetCurrentReview(ctx.User, issue); err != nil { |
|
|
|
|
|
|
|
if !models.IsErrReviewNotExist(err) { |
|
|
|
|
|
|
|
ctx.ServerError("CreateCodeComment", err) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// No pending review exists
|
|
|
|
|
|
|
|
// Create a new pending review for this issue & user
|
|
|
|
|
|
|
|
if review, err = pull_service.CreateReview(models.CreateReviewOptions{ |
|
|
|
|
|
|
|
Type: models.ReviewTypePending, |
|
|
|
|
|
|
|
Reviewer: ctx.User, |
|
|
|
|
|
|
|
Issue: issue, |
|
|
|
|
|
|
|
}); err != nil { |
|
|
|
|
|
|
|
ctx.ServerError("CreateCodeComment", err) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if review.ID == 0 { |
|
|
|
|
|
|
|
review.ID = form.Reply |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//FIXME check if line, commit and treepath exist
|
|
|
|
|
|
|
|
comment, err := comment_service.CreateCodeComment( |
|
|
|
|
|
|
|
ctx.User, |
|
|
|
ctx.User, |
|
|
|
issue.Repo, |
|
|
|
|
|
|
|
issue, |
|
|
|
issue, |
|
|
|
|
|
|
|
signedLine, |
|
|
|
form.Content, |
|
|
|
form.Content, |
|
|
|
form.TreePath, |
|
|
|
form.TreePath, |
|
|
|
signedLine, |
|
|
|
form.IsReview, |
|
|
|
review.ID, |
|
|
|
form.Reply, |
|
|
|
) |
|
|
|
) |
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
ctx.ServerError("CreateCodeComment", err) |
|
|
|
ctx.ServerError("CreateCodeComment", err) |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
// Send no notification if comment is pending
|
|
|
|
|
|
|
|
if !form.IsReview || form.Reply != 0 { |
|
|
|
|
|
|
|
notification.NotifyCreateIssueComment(ctx.User, issue.Repo, issue, comment) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID) |
|
|
|
log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if comment != nil { |
|
|
|
|
|
|
|
ctx.Redirect(comment.HTMLURL()) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// SubmitReview creates a review out of the existing pending review or creates a new one if no pending review exist
|
|
|
|
// SubmitReview creates a review out of the existing pending review or creates a new one if no pending review exist
|
|
|
@ -105,23 +72,17 @@ func SubmitReview(ctx *context.Context, form auth.SubmitReviewForm) { |
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
var review *models.Review |
|
|
|
|
|
|
|
var err error |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
reviewType := form.ReviewType() |
|
|
|
reviewType := form.ReviewType() |
|
|
|
|
|
|
|
|
|
|
|
switch reviewType { |
|
|
|
switch reviewType { |
|
|
|
case models.ReviewTypeUnknown: |
|
|
|
case models.ReviewTypeUnknown: |
|
|
|
ctx.ServerError("GetCurrentReview", fmt.Errorf("unknown ReviewType: %s", form.Type)) |
|
|
|
ctx.ServerError("ReviewType", fmt.Errorf("unknown ReviewType: %s", form.Type)) |
|
|
|
return |
|
|
|
return |
|
|
|
|
|
|
|
|
|
|
|
// can not approve/reject your own PR
|
|
|
|
// can not approve/reject your own PR
|
|
|
|
case models.ReviewTypeApprove, models.ReviewTypeReject: |
|
|
|
case models.ReviewTypeApprove, models.ReviewTypeReject: |
|
|
|
|
|
|
|
|
|
|
|
if issue.Poster.ID == ctx.User.ID { |
|
|
|
if issue.Poster.ID == ctx.User.ID { |
|
|
|
|
|
|
|
|
|
|
|
var translated string |
|
|
|
var translated string |
|
|
|
|
|
|
|
|
|
|
|
if reviewType == models.ReviewTypeApprove { |
|
|
|
if reviewType == models.ReviewTypeApprove { |
|
|
|
translated = ctx.Tr("repo.issues.review.self.approval") |
|
|
|
translated = ctx.Tr("repo.issues.review.self.approval") |
|
|
|
} else { |
|
|
|
} else { |
|
|
@ -134,69 +95,16 @@ func SubmitReview(ctx *context.Context, form auth.SubmitReviewForm) { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
review, err = models.GetCurrentReview(ctx.User, issue) |
|
|
|
_, comm, err := pull_service.SubmitReview(ctx.User, issue, reviewType, form.Content) |
|
|
|
if err == nil { |
|
|
|
|
|
|
|
review.Issue = issue |
|
|
|
|
|
|
|
if errl := review.LoadCodeComments(); errl != nil { |
|
|
|
|
|
|
|
ctx.ServerError("LoadCodeComments", err) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ((err == nil && len(review.CodeComments) == 0) || |
|
|
|
|
|
|
|
(err != nil && models.IsErrReviewNotExist(err))) && |
|
|
|
|
|
|
|
form.HasEmptyContent() { |
|
|
|
|
|
|
|
ctx.Flash.Error(ctx.Tr("repo.issues.review.content.empty")) |
|
|
|
|
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
if !models.IsErrReviewNotExist(err) { |
|
|
|
if models.IsContentEmptyErr(err) { |
|
|
|
ctx.ServerError("GetCurrentReview", err) |
|
|
|
ctx.Flash.Error(ctx.Tr("repo.issues.review.content.empty")) |
|
|
|
return |
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index)) |
|
|
|
} |
|
|
|
} else { |
|
|
|
// No current review. Create a new one!
|
|
|
|
ctx.ServerError("SubmitReview", err) |
|
|
|
if review, err = pull_service.CreateReview(models.CreateReviewOptions{ |
|
|
|
|
|
|
|
Type: reviewType, |
|
|
|
|
|
|
|
Issue: issue, |
|
|
|
|
|
|
|
Reviewer: ctx.User, |
|
|
|
|
|
|
|
Content: form.Content, |
|
|
|
|
|
|
|
}); err != nil { |
|
|
|
|
|
|
|
ctx.ServerError("CreateReview", err) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
review.Content = form.Content |
|
|
|
|
|
|
|
review.Type = reviewType |
|
|
|
|
|
|
|
if err = pull_service.UpdateReview(review); err != nil { |
|
|
|
|
|
|
|
ctx.ServerError("UpdateReview", err) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
comm, err := models.CreateComment(&models.CreateCommentOptions{ |
|
|
|
|
|
|
|
Type: models.CommentTypeReview, |
|
|
|
|
|
|
|
Doer: ctx.User, |
|
|
|
|
|
|
|
Content: review.Content, |
|
|
|
|
|
|
|
Issue: issue, |
|
|
|
|
|
|
|
Repo: issue.Repo, |
|
|
|
|
|
|
|
ReviewID: review.ID, |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
if err != nil || comm == nil { |
|
|
|
|
|
|
|
ctx.ServerError("CreateComment", err) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if err = review.Publish(); err != nil { |
|
|
|
|
|
|
|
ctx.ServerError("Publish", err) |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pr, err := issue.GetPullRequest() |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
ctx.ServerError("GetPullRequest", err) |
|
|
|
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
notification.NotifyPullRequestReview(pr, review, comm) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d#%s", ctx.Repo.RepoLink, issue.Index, comm.HashTag())) |
|
|
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d#%s", ctx.Repo.RepoLink, issue.Index, comm.HashTag())) |
|
|
|
} |
|
|
|
} |
|
|
|