Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Use AppSubUrl for more redirections (#8647) (#8652)

Browse source 
Partial backport without changes to locale files.

Fix #8461 - fix misspelling of {{AppSubUrl}} and other misspelling in template
Fixes /explore and organisation redirection
This commit is contained in:
zeripath 2019-10-23 23:26:54 +01:00 committed by techknowlogick
parent 1e1211c194
commit f9845454cf
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/context/org.go
View file

@ -62,7 +62,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
// Force redirection when username is actually a user. // Force redirection when username is actually a user.
if !org.IsOrganization() { if !org.IsOrganization() {
ctx.Redirect("/" + org.Name) ctx.Redirect(setting.AppSubURL + "/" + org.Name)
return return
} }

2
routers/home.go
View file

@ -272,7 +272,7 @@ func ExploreOrganizations(ctx *context.Context) {
// ExploreCode render explore code page // ExploreCode render explore code page
func ExploreCode(ctx *context.Context) { func ExploreCode(ctx *context.Context) {
if !setting.Indexer.RepoIndexerEnabled { if !setting.Indexer.RepoIndexerEnabled {
ctx.Redirect("/explore", 302) ctx.Redirect(setting.AppSubURL+"/explore", 302)
return return
} }

2
templates/user/auth/grant.tmpl
View file

@ -16,7 +16,7 @@
<p>{{.i18n.Tr "auth.authroize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}</p> <p>{{.i18n.Tr "auth.authroize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}</p>
</div> </div>
<div class="ui attached segment"> <div class="ui attached segment">
<form method="post" action="{{.AppSubUrl}}/login/oauth/grant"> <form method="post" action="{{AppSubUrl}}/login/oauth/grant">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="client_id" value="{{.Application.ClientID}}"> <input type="hidden" name="client_id" value="{{.Application.ClientID}}">
<input type="hidden" name="state" value="{{.State}}"> <input type="hidden" name="state" value="{{.State}}">