mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-08 14:35:52 +01:00
(refs #33)Use RequestCache instead of AccountService directly.
This commit is contained in:
@@ -22,5 +22,10 @@ trait RequestCache {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
|
||||||
|
context.cache(s"account.${mailAddress}"){
|
||||||
|
new AccountService {}.getAccountByMailAddress(mailAddress)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import java.util.Date
|
|||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import twirl.api.Html
|
import twirl.api.Html
|
||||||
import util.StringUtil
|
import util.StringUtil
|
||||||
import service.AccountService
|
|
||||||
import service.RequestCache
|
import service.RequestCache
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -83,11 +82,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
|
|||||||
def assets(implicit context: app.Context): String =
|
def assets(implicit context: app.Context): String =
|
||||||
s"${context.path}/assets"
|
s"${context.path}/assets"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates the link to the account page.
|
||||||
|
*/
|
||||||
def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
|
def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
|
||||||
val account = context.cache(s"account.${mailAddress}"){
|
getAccountByMailAddress(mailAddress).map { account =>
|
||||||
new AccountService {}.getAccountByMailAddress(mailAddress)
|
|
||||||
}
|
|
||||||
account.map { account =>
|
|
||||||
Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${userName}</a>""")
|
Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${userName}</a>""")
|
||||||
} getOrElse Html(userName)
|
} getOrElse Html(userName)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user