From 816e77485fc1c128650dddc05a7d0993edf7d23d Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 7 Jun 2024 23:15:17 +0800 Subject: [PATCH] Fix some URLs whose sub-path is missing (#31289) Fix #31285 (cherry picked from commit 0188d82e4908eb173f7203d577f801f3168ffcb8) Conflicts: templates/user/settings/applications.tmpl (cherry picked from commit 3723d8c32059a571b84dc8636cb3649be6e6f1b3) Conflicts: templates/user/settings/applications.tmpl trivial context conflict vs

(cherry picked from commit bbe98a3254e65eb8b9ec8fddf5e0ffe416a96614) --- templates/admin/packages/list.tmpl | 2 +- templates/devtest/fetch-action.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index d111c57378..4ff49b8c43 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -5,7 +5,7 @@ {{ctx.Locale.Tr "admin.packages.total_size" (ctx.Locale.TrSize .TotalBlobSize)}}, {{ctx.Locale.Tr "admin.packages.unreferenced_size" (ctx.Locale.TrSize .TotalUnreferencedBlobSize)}})

-
+ {{.CsrfTokenHtml}}
diff --git a/templates/devtest/fetch-action.tmpl b/templates/devtest/fetch-action.tmpl index 7b0bbba554..be15a5389f 100644 --- a/templates/devtest/fetch-action.tmpl +++ b/templates/devtest/fetch-action.tmpl @@ -25,7 +25,7 @@
-
+
bad action url
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 54fdf9fbed..bd51a552bc 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -75,7 +75,7 @@ {{ctx.Locale.Tr "settings.select_permissions"}}

- {{ctx.Locale.Tr "settings.access_token_desc" (`href="/api/swagger" target="_blank"`|SafeHTML) (`href="https://forgejo.org/docs/latest/user/token-scope/" target="_blank"`|SafeHTML)}} + {{ctx.Locale.Tr "settings.access_token_desc" (HTMLFormat `href="%s/api/swagger" target="_blank"` AppSubUrl) (`href="https://forgejo.org/docs/latest/user/token-scope/" target="_blank"`|SafeHTML)}}