Fix presentation of index page and sign-in page.

This commit is contained in:
takezoe
2013-06-29 03:49:31 +09:00
parent 7da39b4785
commit c7d6a56ea2
7 changed files with 68 additions and 21 deletions

View File

@@ -2,12 +2,13 @@ package app
import service._
class IndexController extends IndexControllerBase with RepositoryService with AccountService
class IndexController extends IndexControllerBase with RepositoryService with AccountService with SystemSettingsService
trait IndexControllerBase extends ControllerBase { self: RepositoryService =>
trait IndexControllerBase extends ControllerBase { self: RepositoryService with SystemSettingsService =>
get("/"){
html.index(getAccessibleRepositories(context.loginAccount, baseUrl))
html.index(getAccessibleRepositories(context.loginAccount, baseUrl), loadSystemSettings(),
context.loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil))
}
}