diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 3beb824..4c2f6cb 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -11,14 +11,12 @@ import org.apache.commons.io.FileUtils import org.eclipse.jgit.treewalk._ -// TODO Should models move to other package? - class RepositoryViewerController extends RepositoryViewerControllerBase with ProjectService with AccountService /** * The repository viewer. */ -trait RepositoryViewerControllerBase extends ControllerBase { self: ProjectService => +trait RepositoryViewerControllerBase extends ControllerBase { self: ProjectService with AccountService => // TODO separate to AccountController? /** @@ -27,7 +25,7 @@ get("/:owner") { val owner = params("owner") - html.user(owner, getRepositories(owner, servletContext)) + html.user(getAccountByUserName(owner).get, getRepositories(owner, servletContext)) } /** diff --git a/src/main/twirl/user.scala.html b/src/main/twirl/user.scala.html index f2fa13b..d881c7d 100644 --- a/src/main/twirl/user.scala.html +++ b/src/main/twirl/user.scala.html @@ -1,16 +1,16 @@ -@(user: String, repositories: List[service.ProjectService.RepositoryInfo])(implicit context: app.Context) +@(account: model.Account, repositories: List[service.ProjectService.RepositoryInfo])(implicit context: app.Context) @import context._ -@main(user){ +@main(account.userName){
Naoki Takezoe
-
@user
+
@account.userName
-
http://d.hatena.co.jp/takezoe
-
Joined on yyyy/mm/dd
+
@account.url
+
Joined on @account.registeredDate