diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 4d939ae..23818c6 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -255,7 +255,7 @@ commits, diffs, repository.repository.originUserName.map { userName => - getRepositoryNames(getForkedRepositoryTree(userName, repository.name)) + getForkedRepositories(userName, repository.name) } getOrElse Nil, originBranch, forkedBranch, diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index f5e7dc7..62980a4 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -184,7 +184,7 @@ get("/:owner/:repository/network/members")(referrersOnly { repository => repo.html.forked( - getForkedRepositoryTree( + getForkedRepositories( repository.repository.originUserName.getOrElse(repository.owner), repository.repository.originRepositoryName.getOrElse(repository.name)), repository) diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala index b03a0b5..26563a8 100644 --- a/src/main/scala/service/RepositoryService.scala +++ b/src/main/scala/service/RepositoryService.scala @@ -201,17 +201,11 @@ }.list.length - def getForkedRepositoryTree(userName: String, repositoryName: String): RepositoryTreeNode = { - RepositoryTreeNode(userName, repositoryName, - Query(Repositories).filter { t => - (t.parentUserName is userName.bind) && (t.parentRepositoryName is repositoryName.bind) - }.map { t => - t.userName ~ t.repositoryName - }.list.map { case (userName, repositoryName) => - getForkedRepositoryTree(userName, repositoryName) - } - ) - } + def getForkedRepositories(userName: String, repositoryName: String): List[String] = + Query(Repositories).filter { t => + (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind) + } + .sortBy(_.lastActivityDate desc).map(_.userName).list } diff --git a/src/main/twirl/repo/forked.scala.html b/src/main/twirl/repo/forked.scala.html index 4efe751..a90c74a 100644 --- a/src/main/twirl/repo/forked.scala.html +++ b/src/main/twirl/repo/forked.scala.html @@ -1,4 +1,4 @@ -@(members: service.RepositoryService.RepositoryTreeNode, +@(members: List[String], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._ @@ -7,22 +7,9 @@
  • Members
  • Members of the @repository.name Network

    - -} - -@renderTree(node: service.RepositoryService.RepositoryTreeNode) = { -
  • -
    - @avatar(node.owner, 20) @node.owner / @node.name + @members.map { owner => + - @if(node.children.nonEmpty){ - - } -
  • -} \ No newline at end of file + } +}