Fix redirect path to the context root.

This commit is contained in:
takezoe
2013-09-11 03:53:50 +09:00
parent 7bce8cf3b6
commit 4a6eb95474

View File

@@ -42,12 +42,12 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
session.setAttribute("LOGIN_ACCOUNT", account) session.setAttribute("LOGIN_ACCOUNT", account)
updateLastLoginDate(account.userName) updateLastLoginDate(account.userName)
session.get("REDIRECT").map { redirectUrl => session.get("REDIRECT").map { case redirectUrl: String =>
session.removeAttribute("REDIRECT") session.removeAttribute("REDIRECT")
if(redirectUrl == request.getContextPath + "/"){ if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
redirect("/") redirect("/")
} else { } else {
redirect(redirectUrl.asInstanceOf[String]) redirect(redirectUrl)
} }
}.getOrElse { }.getOrElse {
redirect("/") redirect("/")