Skip to content

Commit e7b6852

Browse files
Fix Legacy Review Resolution Regression (#7901)
1 parent 373f1da commit e7b6852

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Review.cshtml.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,6 @@ public async Task<IActionResult> OnGetAsync(string id, string revisionId = null)
9191
showDocumentation: (ShowDocumentation ?? false), showDiffOnly: ShowDiffOnly, diffContextSize: REVIEW_DIFF_CONTEXT_SIZE,
9292
diffContextSeperator: DIFF_CONTEXT_SEPERATOR);
9393

94-
if (!String.IsNullOrEmpty(ReviewContent.ActiveAPIRevision.Files.First().CrossLanguagePackageId))
95-
{
96-
var correspondingReviewId = await _apiRevisionsManager.GetReviewIdsOfLanguageCorrespondingReviewAsync(ReviewContent.ActiveAPIRevision.Files.First().CrossLanguagePackageId);
97-
var correspondingReviews = await _reviewManager.GetReviewsAsync(reviewIds: correspondingReviewId.Where(_ => _ != id).ToList(), isClosed: false);
98-
foreach (var review in correspondingReviews)
99-
{
100-
var reviewContent = await PageModelHelpers.GetReviewContentAsync(configuration: _configuration,
101-
reviewManager: _reviewManager, preferenceCache: _preferenceCache, userProfileRepository: _userProfileRepository,
102-
reviewRevisionsManager: _apiRevisionsManager, commentManager: _commentsManager, codeFileRepository: _codeFileRepository,
103-
signalRHubContext: _signalRHubContext, user: User, review: review, revisionId: null, diffRevisionId: null,
104-
showDocumentation: (ShowDocumentation ?? false), showDiffOnly: ShowDiffOnly, diffContextSize: REVIEW_DIFF_CONTEXT_SIZE,
105-
diffContextSeperator: DIFF_CONTEXT_SEPERATOR);
106-
107-
ReviewContent.CrossLanguageViewContent.Add(review.Language, reviewContent);
108-
}
109-
}
110-
11194
if (ReviewContent.Directive == ReviewContentModelDirective.TryGetlegacyReview)
11295
{
11396
// Check if you can get review from legacy data
@@ -153,6 +136,23 @@ public async Task<IActionResult> OnGetAsync(string id, string revisionId = null)
153136
return RedirectToPage("LegacyReview", new { id = id });
154137
}
155138

139+
if (!String.IsNullOrEmpty(ReviewContent.ActiveAPIRevision.Files.First().CrossLanguagePackageId))
140+
{
141+
var correspondingReviewId = await _apiRevisionsManager.GetReviewIdsOfLanguageCorrespondingReviewAsync(ReviewContent.ActiveAPIRevision.Files.First().CrossLanguagePackageId);
142+
var correspondingReviews = await _reviewManager.GetReviewsAsync(reviewIds: correspondingReviewId.Where(_ => _ != id).ToList(), isClosed: false);
143+
foreach (var review in correspondingReviews)
144+
{
145+
var reviewContent = await PageModelHelpers.GetReviewContentAsync(configuration: _configuration,
146+
reviewManager: _reviewManager, preferenceCache: _preferenceCache, userProfileRepository: _userProfileRepository,
147+
reviewRevisionsManager: _apiRevisionsManager, commentManager: _commentsManager, codeFileRepository: _codeFileRepository,
148+
signalRHubContext: _signalRHubContext, user: User, review: review, revisionId: null, diffRevisionId: null,
149+
showDocumentation: (ShowDocumentation ?? false), showDiffOnly: ShowDiffOnly, diffContextSize: REVIEW_DIFF_CONTEXT_SIZE,
150+
diffContextSeperator: DIFF_CONTEXT_SEPERATOR);
151+
152+
ReviewContent.CrossLanguageViewContent.Add(review.Language, reviewContent);
153+
}
154+
}
155+
156156
return Page();
157157
}
158158

0 commit comments

Comments
 (0)