Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-30 18:15:59 +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

11
src/main/scala/app/ControllerBase.scala
View File

@@ -18,8 +18,13 @@ abstract class ControllerBase extends ScalatraFilter
/**
* Returns the context object for the request.
*/
implicit def context: Context = Context(servletContext.getContextPath, LoginAccount)
implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, currentURL)
private def currentURL: String = {
val queryString = request.getQueryString
request.getRequestURI + (if(queryString != null) "?" + queryString else "")
}
private def LoginAccount: Option[Account] = {
session.get("LOGIN_ACCOUNT") match {
case Some(x: Account) => Some(x)
@@ -79,4 +84,4 @@ abstract class ControllerBase extends ScalatraFilter
}
case class Context(path: String, loginAccount: Option[Account])
case class Context(path: String, loginAccount: Option[Account], currentUrl: String)