diff options
| author | Giteabot <teabot@gitea.io> | 2024-03-02 20:26:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 12:26:54 +0000 |
| commit | 401cc394d52c6126d3cbca1e1367c4e4da5110f9 (patch) | |
| tree | 3a8881855a8c3c4a762aba16c1862a66776545b4 | |
| parent | 3a8877c058fd8583f28711750cf26716526200c4 (diff) | |
| download | gitea-401cc394d52c6126d3cbca1e1367c4e4da5110f9.tar.gz gitea-401cc394d52c6126d3cbca1e1367c4e4da5110f9.zip | |
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 <wxiaoguang@gmail.com>
| -rw-r--r-- | templates/repo/diff/comments.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/diff/conversation.tmpl | 2 | ||||
| -rw-r--r-- | web_src/js/features/notification.js | 2 | ||||
| -rw-r--r-- | 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 @@ <div class="comment-header-right actions gt-df gt-ac"> {{if .Invalidated}} {{$referenceUrl := printf "%s#%s" $.root.Issue.Link .HashTag}} - <a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> + <a href="{{$referenceUrl}}" class="ui label basic small" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> {{ctx.Locale.Tr "repo.issues.review.outdated"}} </a> {{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 --> - <a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small gt-ml-3" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> + <a href="{{$referenceUrl}}" class="ui label basic small gt-ml-3" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}"> {{ctx.Locale.Tr "repo.issues.review.outdated"}} </a> {{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', |