From a00974c3b8a589677c508c522d3aab8b57b839f3 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 26 May 2020 23:39:39 +0100 Subject: When must change password only show Signout (#11600) When "Must Change Password" simplify the navbar header to only show the signout button as all other links will redirect back. This prevents the notifications icon from showing preventing initialization of the event-source and hence preventing redirect_to being set, however in addition do not set the redirect_to cookie if we are looking at the /user/events page. Fix #11554 Signed-off-by: Andrew Thornton --- modules/context/auth.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/context/auth.go b/modules/context/auth.go index 7410db75a5..86922aae59 100644 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -49,7 +49,9 @@ func Toggle(options *ToggleOptions) macaron.Handler { if ctx.Req.URL.Path != "/user/settings/change_password" { ctx.Data["Title"] = ctx.Tr("auth.must_change_password") ctx.Data["ChangePasscodeLink"] = setting.AppSubURL + "/user/change_password" - ctx.SetCookie("redirect_to", setting.AppSubURL+ctx.Req.URL.RequestURI(), 0, setting.AppSubURL) + if ctx.Req.URL.Path != "/user/events" { + ctx.SetCookie("redirect_to", setting.AppSubURL+ctx.Req.URL.RequestURI(), 0, setting.AppSubURL) + } ctx.Redirect(setting.AppSubURL + "/user/settings/change_password") return } -- cgit v1.2.3