mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 10:44:12 +01:00 
			
		
		
		
	Dont load Review if Comment is CommentTypeReviewRequest (#28551)
RequestReview get deleted on review. So we don't have to try to load them on comments. broken out #28544
This commit is contained in:
		
							parent
							
								
									b85e4a64fa
								
							
						
					
					
						commit
						6fad2c8744
					
				@ -695,8 +695,15 @@ func (c *Comment) LoadReactions(ctx context.Context, repo *repo_model.Repository
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (c *Comment) loadReview(ctx context.Context) (err error) {
 | 
			
		||||
	if c.ReviewID == 0 {
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
	if c.Review == nil {
 | 
			
		||||
		if c.Review, err = GetReviewByID(ctx, c.ReviewID); err != nil {
 | 
			
		||||
			// review request which has been replaced by actual reviews doesn't exist in database anymore, so ignorem them.
 | 
			
		||||
			if c.Type == CommentTypeReviewRequest {
 | 
			
		||||
				return nil
 | 
			
		||||
			}
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@ -430,7 +430,8 @@ func (comments CommentList) loadReviews(ctx context.Context) error {
 | 
			
		||||
	for _, comment := range comments {
 | 
			
		||||
		comment.Review = reviews[comment.ReviewID]
 | 
			
		||||
		if comment.Review == nil {
 | 
			
		||||
			if comment.ReviewID > 0 {
 | 
			
		||||
			// review request which has been replaced by actual reviews doesn't exist in database anymore, so don't log errors for them.
 | 
			
		||||
			if comment.ReviewID > 0 && comment.Type != CommentTypeReviewRequest {
 | 
			
		||||
				log.Error("comment with review id [%d] but has no review record", comment.ReviewID)
 | 
			
		||||
			}
 | 
			
		||||
			continue
 | 
			
		||||
 | 
			
		||||
@ -621,6 +621,9 @@ func AddReviewRequest(ctx context.Context, issue *Issue, reviewer, doer *user_mo
 | 
			
		||||
		return nil, err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// func caller use the created comment to retrieve created review too.
 | 
			
		||||
	comment.Review = review
 | 
			
		||||
 | 
			
		||||
	return comment, committer.Commit()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user