From 401cc394d52c6126d3cbca1e1367c4e4da5110f9 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 2 Mar 2024 20:26:54 +0800 Subject: [PATCH] Fix incorrect subpath in links (#29535) (#29541) Backport #29535 by wxiaoguang * `$referenceUrl`: it is constructed by "Issue.Link", which already has the "AppSubURL" * `window.location.href`: AppSubURL could be empty string, so it needs the trailing slash Co-authored-by: wxiaoguang --- templates/repo/diff/comments.tmpl | 2 +- templates/repo/diff/conversation.tmpl | 2 +- web_src/js/features/notification.js | 2 +- web_src/js/features/stopwatch.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 1e9af5c4a1..47a4502efd 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -33,7 +33,7 @@
{{if .Invalidated}} {{$referenceUrl := printf "%s#%s" $.root.Issue.Link .HashTag}} - + {{ctx.Locale.Tr "repo.issues.review.outdated"}} {{end}} diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index feca7b6c0b..aaeac3c550 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -14,7 +14,7 @@ We only handle the case $resolved=true and $invalid=true in this template because if the comment is not resolved it has the outdated label in the comments area (not the header above). The case $resolved=false and $invalid=true is handled in repo/diff/comments.tmpl --> - + {{ctx.Locale.Tr "repo.issues.review.outdated"}} {{end}} diff --git a/web_src/js/features/notification.js b/web_src/js/features/notification.js index 4dcf02d2dc..a9236247c6 100644 --- a/web_src/js/features/notification.js +++ b/web_src/js/features/notification.js @@ -112,7 +112,7 @@ export function initNotificationCount() { type: 'close', }); worker.port.close(); - window.location.href = appSubUrl; + window.location.href = `${appSubUrl}/`; } else if (event.data.type === 'close') { worker.port.postMessage({ type: 'close', diff --git a/web_src/js/features/stopwatch.js b/web_src/js/features/stopwatch.js index f43014fec5..799e3a7bcb 100644 --- a/web_src/js/features/stopwatch.js +++ b/web_src/js/features/stopwatch.js @@ -74,7 +74,7 @@ export function initStopwatch() { type: 'close', }); worker.port.close(); - window.location.href = appSubUrl; + window.location.href = `${appSubUrl}/`; } else if (event.data.type === 'close') { worker.port.postMessage({ type: 'close',