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)
- @if(repository.commitCount > 0){ -
- @* - - *@ - @if(loginAccount.isEmpty){ - - Fork @repository.forkedCount - - } else { - @if(isNoGroup) { - - Fork @repository.forkedCount - - } else { - - Fork @repository.forkedCount - - } - } - @* - - @repository.forkedCount - *@ -
- @if(loginAccount.isDefined && isNoGroup){ - - } - } @helper.html.repositoryicon(repository, true) @repository.owner / @repository.name @@ -74,6 +42,7 @@ @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ @menuitem("/settings" , "settings" , "tools", "Settings") } + @menuitem("/network/members", "fork", "git-branch", "Forks", repository.forkedCount)
@@ -113,43 +82,3 @@ } @body - diff --git a/src/main/twirl/gitbucket/core/repo/files.scala.html b/src/main/twirl/gitbucket/core/repo/files.scala.html index 6149a75..14c464d 100644 --- a/src/main/twirl/gitbucket/core/repo/files.scala.html +++ b/src/main/twirl/gitbucket/core/repo/files.scala.html @@ -1,7 +1,6 @@ @(branch: String, repository: gitbucket.core.service.RepositoryService.RepositoryInfo, pathList: List[String], - groupNames: List[String], latestCommit: gitbucket.core.util.JGitUtil.CommitInfo, files: List[gitbucket.core.util.JGitUtil.FileInfo], readme: Option[(List[String], String)], @@ -22,7 +21,7 @@ } else { s"${(repository.name :: pathList).mkString("/")} at ${encodeRefName(branch)} - ${repository.owner}/${repository.name}" }, Some(repository)) { - @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){ + @html.menu("code", repository, Some(branch), pathList.isEmpty, info, error){
@if(pathList.isEmpty){
diff --git a/src/main/twirl/gitbucket/core/repo/find.scala.html b/src/main/twirl/gitbucket/core/repo/find.scala.html index 4ac39e8..d3840b6 100644 --- a/src/main/twirl/gitbucket/core/repo/find.scala.html +++ b/src/main/twirl/gitbucket/core/repo/find.scala.html @@ -1,12 +1,11 @@ @(branch: String, treeId: String, - repository: gitbucket.core.service.RepositoryService.RepositoryInfo, - groupNames: List[String] + repository: gitbucket.core.service.RepositoryService.RepositoryInfo )(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.menu("code", repository, Some(branch), false, groupNames.isEmpty){ + @html.menu("code", repository, Some(branch), false){
diff --git a/src/main/twirl/gitbucket/core/repo/forked.scala.html b/src/main/twirl/gitbucket/core/repo/forked.scala.html index 028c12b..d74c84d 100644 --- a/src/main/twirl/gitbucket/core/repo/forked.scala.html +++ b/src/main/twirl/gitbucket/core/repo/forked.scala.html @@ -1,14 +1,28 @@ @(originRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo], members: List[(String, String)], + groupNames: List[String], repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.menu("network", repository){ - -

Members of the @repository.name Network

+ @html.menu("fork", repository){ +

+ Forked repositories + @if(loginAccount.isEmpty){ + Fork + } else { + @if(groupNames.isEmpty) { + Fork + } else { + Fork + } + } +

+ @if(loginAccount.isDefined && groupNames.isEmpty){ + + }
@if(originRepository.isDefined){ @avatar(originRepository.get.owner, 20) @@ -33,3 +47,26 @@ } } } +