Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 21:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Redirect to previous URL after sign in.

Browse Source
This commit is contained in:
takezoe
2013-06-29 04:31:58 +09:00
parent b69e35f2d1
commit 9650cc48cc
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/app/SignInController.scala
View File

@@ -15,6 +15,10 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
)(SignInForm.apply)
get("/signin"){
val queryString = request.getQueryString
if(queryString.startsWith("/")){
session.setAttribute("REDIRECT", queryString)
}
html.signin(loadSystemSettings())
}
@@ -25,7 +29,13 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
} else {
session.setAttribute("LOGIN_ACCOUNT", account.get)
updateLastLoginDate(account.get.userName)
redirect("/%s".format(account.get.userName))
session.get("REDIRECT").map { redirectUrl =>
session.removeAttribute("REDIRECT")
redirect(redirectUrl.asInstanceOf[String])
}.getOrElse {
redirect("/%s".format(account.get.userName))
}
}
}