From 1d10747514477b7b04af57d3835c4939144a6cc3 Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 23 Oct 2019 23:27:10 +0100 Subject: [PATCH] Use AppSubUrl for more redirections (#8647) (#8651) Partial backport without changes to locale files. Fix #8461 - fix misspelling of {{AppSubUrl}} and other misspelling in template Fixes /explore and organisation redirection --- modules/context/org.go | 2 +- routers/home.go | 2 +- templates/user/auth/grant.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/context/org.go b/modules/context/org.go index 4867474334..10791c9d01 100644 --- a/modules/context/org.go +++ b/modules/context/org.go @@ -63,7 +63,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { // Force redirection when username is actually a user. if !org.IsOrganization() { - ctx.Redirect("/" + org.Name) + ctx.Redirect(setting.AppSubURL + "/" + org.Name) return } diff --git a/routers/home.go b/routers/home.go index f8fb849c8e..eddff28ee9 100644 --- a/routers/home.go +++ b/routers/home.go @@ -273,7 +273,7 @@ func ExploreOrganizations(ctx *context.Context) { // ExploreCode render explore code page func ExploreCode(ctx *context.Context) { if !setting.Indexer.RepoIndexerEnabled { - ctx.Redirect("/explore", 302) + ctx.Redirect(setting.AppSubURL+"/explore", 302) return } diff --git a/templates/user/auth/grant.tmpl b/templates/user/auth/grant.tmpl index 85c507a74a..7ac8f18df7 100644 --- a/templates/user/auth/grant.tmpl +++ b/templates/user/auth/grant.tmpl @@ -16,7 +16,7 @@

{{.i18n.Tr "auth.authroize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}

-
+ {{.CsrfTokenHtml}}