diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index ddf888d..b710ea5 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -2,12 +2,13 @@ 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)) } } \ No newline at end of file diff --git a/src/main/scala/app/SignInController.scala b/src/main/scala/app/SignInController.scala index babc1fd..e840c77 100644 --- a/src/main/scala/app/SignInController.scala +++ b/src/main/scala/app/SignInController.scala @@ -31,7 +31,7 @@ get("/signout"){ session.invalidate - redirect("/signin") + redirect("/") } } \ No newline at end of file diff --git a/src/main/twirl/account/useredit.scala.html b/src/main/twirl/account/useredit.scala.html index 8c64348..2c97247 100644 --- a/src/main/twirl/account/useredit.scala.html +++ b/src/main/twirl/account/useredit.scala.html @@ -1,7 +1,12 @@ @(account: Option[model.Account])(implicit context: app.Context) @import context._ @import view.helpers._ -@html.main((if(account.isDefined) "Your Profile" else "Create account")){ +@html.main((if(account.isDefined) "Edit your profile" else "Create your account")){ + @if(account.isDefined){ +