Fix a compare page 404 bug when the pull request disabled (#35441)

lunny · web-flow · commit 274f4aea7e94 · 2025-09-09T21:04:32.000-07:00
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
@@ -524,7 +524,7 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
 
 	// Treat as pull request if both references are branches
 	if ctx.Data["PageIsComparePull"] == nil {
-		ctx.Data["PageIsComparePull"] = headIsBranch && baseIsBranch
+		ctx.Data["PageIsComparePull"] = headIsBranch && baseIsBranch && permBase.CanReadIssuesOrPulls(true)
 	}
 
 	if ctx.Data["PageIsComparePull"] == true && !permBase.CanReadIssuesOrPulls(true) {
@@ -730,6 +730,7 @@ func CompareDiff(ctx *context.Context) {
 		return
 	}
 
+	ctx.Data["PageIsViewCode"] = true
 	ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
 	ctx.Data["DirectComparison"] = ci.DirectComparison
 	ctx.Data["OtherCompareSeparator"] = ".."

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ func ParseCompareInfo(ctx context.Context) common.CompareInfo {`
`524`	`524`
`525`	`525`	`// Treat as pull request if both references are branches`
`526`	`526`	`if ctx.Data["PageIsComparePull"] == nil {`
`527`		`- ctx.Data["PageIsComparePull"] = headIsBranch && baseIsBranch`
	`527`	`+ ctx.Data["PageIsComparePull"] = headIsBranch && baseIsBranch && permBase.CanReadIssuesOrPulls(true)`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`if ctx.Data["PageIsComparePull"] == true && !permBase.CanReadIssuesOrPulls(true) {`
`@@ -730,6 +730,7 @@ func CompareDiff(ctx *context.Context) {`
`730`	`730`	`return`
`731`	`731`	`}`
`732`	`732`
	`733`	`+ ctx.Data["PageIsViewCode"] = true`
`733`	`734`	`ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes`
`734`	`735`	`ctx.Data["DirectComparison"] = ci.DirectComparison`
`735`	`736`	`ctx.Data["OtherCompareSeparator"] = ".."`