From fcc3824bbdbae7b92ba3ca00becf906a2999e546 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E9=87=8D=E5=AE=9A=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/context/auth.go | 9 +++++++-- modules/context/context.go | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/context/auth.go b/modules/context/auth.go index 2624dabbd..7a1c405f8 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -81,8 +81,13 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Redirect to dashboard if user tries to visit any non-login page. if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" { - log.Info("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY") - ctx.Redirect(setting.AppSubURL + "/") + redirectTo := ctx.Query("redirect_to") + log.Info("redirect_to=" + redirectTo) + if len(redirectTo) > 0 { + ctx.Redirect(redirectTo) + } else { + ctx.Redirect(setting.AppSubURL + "/") + } return } diff --git a/modules/context/context.go b/modules/context/context.go index 779b2c531..8c7808466 100755 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -308,7 +308,6 @@ func Contexter() macaron.Handler { if ctx.User != nil { ctx.IsSigned = true - log.Info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") ctx.Data["IsSigned"] = ctx.IsSigned ctx.Data["SignedUser"] = ctx.User ctx.Data["SignedUserID"] = ctx.User.ID