diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala index e5680d3..b1fa0f9 100644 --- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala @@ -497,6 +497,10 @@ getForkedRepositories( repository.repository.originUserName.getOrElse(repository.owner), repository.repository.originRepositoryName.getOrElse(repository.name)), + context.loginAccount match { + case None => List() + case account: Option[Account] => getGroupsByUserName(account.get.userName) + }, // groups of current user repository) }) @@ -507,13 +511,7 @@ using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git => val ref = multiParams("splat").head JGitUtil.getTreeId(git, ref).map{ treeId => - html.find(ref, - treeId, - repository, - context.loginAccount match { - case None => List() - case account: Option[Account] => getGroupsByUserName(account.get.userName) - }) + html.find(ref, treeId, repository) } getOrElse NotFound } }) @@ -575,10 +573,6 @@ html.files(revision, repository, if(path == ".") Nil else path.split("/").toList, // current path - context.loginAccount match { - case None => List() - case account: Option[Account] => getGroupsByUserName(account.get.userName) - }, // groups of current user new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount), getPullRequestFromBranch(repository.owner, repository.name, revstr, repository.repository.defaultBranch), diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index af05fe4..7fe341d 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -2,7 +2,6 @@ repository: gitbucket.core.service.RepositoryService.RepositoryInfo, id: Option[String] = None, isRepoTop: Boolean = false, - isNoGroup: Boolean = true, info: Option[Any] = None, error: Option[Any] = None)(body: Html)(implicit context: gitbucket.core.controller.Context) @import context._ @@ -24,37 +23,6 @@ @helper.html.information(info) @helper.html.error(error)