diff options
| author | zeripath <art27@cantab.net> | 2019-10-23 22:04:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 22:04:22 +0100 |
| commit | c84174b7640c17c85c8e3bb86c02cd39b09822e1 (patch) | |
| tree | c3b21092e54b46ff05bd09c581f73daccdd3aa61 | |
| parent | 22272fe1e44fb6f1084f34694f6834d97167b3e1 (diff) | |
| download | gitea-c84174b7640c17c85c8e3bb86c02cd39b09822e1.tar.gz gitea-c84174b7640c17c85c8e3bb86c02cd39b09822e1.zip | |
Use AppSubUrl for more redirections (#8647)
Fix #8461 - fix misspelling of {{AppSubUrl}} and other misspelling in template
Fixes /explore and organisation redirection
| -rw-r--r-- | modules/context/org.go | 2 | ||||
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 | ||||
| -rw-r--r-- | routers/home.go | 2 | ||||
| -rw-r--r-- | templates/user/auth/grant.tmpl | 4 |
4 files changed, 5 insertions, 5 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/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 60acab0178..83047ef6f1 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -259,7 +259,7 @@ openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.op disable_forgot_password_mail = Account recovery is disabled. Please contact your site administrator. email_domain_blacklisted = You cannot register with your email address. authorize_application = Authorize Application -authroize_redirect_notice = You will be redirected to %s if you authorize this application. +authorize_redirect_notice = You will be redirected to %s if you authorize this application. authorize_application_created_by = This application was created by %s. authorize_application_description = If you grant the access, it will be able to access and write to all your account information, including private repos and organisations. authorize_title = Authorize "%s" to access your account? 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..b67bfa110c 100644 --- a/templates/user/auth/grant.tmpl +++ b/templates/user/auth/grant.tmpl @@ -13,10 +13,10 @@ </p> </div> <div class="ui attached segment"> - <p>{{.i18n.Tr "auth.authroize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}</p> + <p>{{.i18n.Tr "auth.authorize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}</p> </div> <div class="ui attached segment"> - <form method="post" action="{{.AppSubUrl}}/login/oauth/grant"> + <form method="post" action="{{AppSubUrl}}/login/oauth/grant"> {{.CsrfTokenHtml}} <input type="hidden" name="client_id" value="{{.Application.ClientID}}"> <input type="hidden" name="state" value="{{.State}}"> |