diff --git a/src/main/scala/service/RequestCache.scala b/src/main/scala/service/RequestCache.scala index 758c37326..059e91cab 100644 --- a/src/main/scala/service/RequestCache.scala +++ b/src/main/scala/service/RequestCache.scala @@ -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) + } + } } diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala index b2648a0c5..b53f227ef 100644 --- a/src/main/scala/view/helpers.scala +++ b/src/main/scala/view/helpers.scala @@ -3,7 +3,6 @@ import java.util.Date import java.text.SimpleDateFormat import twirl.api.Html import util.StringUtil -import service.AccountService import service.RequestCache /** @@ -83,11 +82,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache def assets(implicit context: app.Context): String = s"${context.path}/assets" + /** + * Generates the link to the account page. + */ def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = { - val account = context.cache(s"account.${mailAddress}"){ - new AccountService {}.getAccountByMailAddress(mailAddress) - } - account.map { account => + getAccountByMailAddress(mailAddress).map { account => Html(s"""${userName}""") } getOrElse Html(userName) }