#4411 fix-4083

Merged
zouap merged 3 commits from fix-4083 into V20230628 10 months ago
  1. +13
    -1
      models/review.go
  2. +15
    -0
      services/pull/review.go

+ 13
- 1
models/review.go View File

@@ -182,6 +182,18 @@ func findReviews(e Engine, opts FindReviewOptions) ([]*Review, error) {
Find(&reviews)
}

func findReviewsSortByDesc(e Engine, opts FindReviewOptions) ([]*Review, error) {
reviews := make([]*Review, 0, 10)
sess := e.Where(opts.toCond())
if opts.Page > 0 {
sess = opts.ListOptions.setSessionPagination(sess)
}
return reviews, sess.
Desc("created_unix").
Desc("id").
Find(&reviews)
}

// FindReviews returns reviews passing FindReviewOptions
func FindReviews(opts FindReviewOptions) ([]*Review, error) {
return findReviews(x, opts)
@@ -246,7 +258,7 @@ func getCurrentReview(e Engine, reviewer *User, issue *Issue) (*Review, error) {
if reviewer == nil {
return nil, nil
}
reviews, err := findReviews(e, FindReviewOptions{
reviews, err := findReviewsSortByDesc(e, FindReviewOptions{
Type: ReviewTypePending,
IssueID: issue.ID,
ReviewerID: reviewer.ID,


+ 15
- 0
services/pull/review.go View File

@@ -77,6 +77,21 @@ func CreateCodeComment(doer *models.User, gitRepo *git.Repository, issue *models
if err != nil {
return nil, err
}
} else {

if replyReviewID == 0 {
review, err = models.CreateReview(models.CreateReviewOptions{
Type: models.ReviewTypePending,
Reviewer: doer,
Issue: issue,
Official: false,
CommitID: latestCommitID,
})
if err != nil {
return nil, err
}
}

}

comment, err := createCodeComment(


Loading…
Cancel
Save