Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add SystemSettings to Context properties

Browse Source
This commit is contained in:
takezoe
2014-03-15 01:24:34 +09:00
parent 4870533710
commit 02a367fd99
24 changed files with 53 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ abstract class ControllerBase extends ScalatraFilter
implicit def context: Context = {
contextCache.get match {
case null => {
val context = Context(loadSystemSettings().baseUrl.getOrElse(servletContext.getContextPath), LoginAccount, request)
val context = Context(loadSystemSettings(), LoginAccount, request)
contextCache.set(context)
context
}
@@ -138,10 +138,10 @@ abstract class ControllerBase extends ScalatraFilter
/**
* Context object for the current request.
*
* @param path the context path
*/
case class Context(path: String, loginAccount: Option[Account], request: HttpServletRequest){
case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)