From: sebastian-sauer <sauer.sebastian@gmail.com>
Date: Fri, 30 Jun 2023 16:08:18 +0000 (+0200)
Subject: Use AfterCommitId to get commit for Viewed functionality (#25529)
X-Git-Tag: v1.21.0-rc0~662
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ed8a8af99f125cebc8291e510d61511f8e56b04f;p=gitea.git

Use AfterCommitId to get commit for Viewed functionality (#25529)

the PullHeadCommitID is not always available when the PR is merged.

Not sure if this is the best solution but in my simple tests it looks
like this fixes the problem - happy to get any feedback.

hopefully fixes https://github.com/go-gitea/gitea/issues/24813
---

diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 1198452f7e..8f570e5efc 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -147,7 +147,7 @@
 										{{end}}
 									{{end}}
 									{{if $isReviewFile}}
-										<label data-link="{{$.Issue.Link}}/viewed-files" data-headcommit="{{$.PullHeadCommitID}}" class="viewed-file-form unselectable{{if $file.IsViewed}} viewed-file-checked-form{{end}}">
+										<label data-link="{{$.Issue.Link}}/viewed-files" data-headcommit="{{$.AfterCommitID}}" class="viewed-file-form unselectable{{if $file.IsViewed}} viewed-file-checked-form{{end}}">
 											<input type="checkbox" name="{{$file.GetDiffFileName}}" autocomplete="off"{{if $file.IsViewed}} checked{{end}}> {{$.locale.Tr "repo.pulls.has_viewed_file"}}
 										</label>
 									{{end}}