diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 2a313c0..9b3a322 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -436,6 +436,10 @@ repo.html.files(revision, repository, if(path == ".") Nil else path.split("/").toList, // current path + context.loginAccount match { + case None => List() + case account: Option[model.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), flash.get("info"), flash.get("error")) diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html index e659467..8e85704 100644 --- a/src/main/twirl/menu.scala.html +++ b/src/main/twirl/menu.scala.html @@ -2,6 +2,7 @@ repository: service.RepositoryService.RepositoryInfo, id: Option[String] = None, expand: Boolean = false, + isNoGroup: Boolean = true, info: Option[Any] = None, error: Option[Any] = None)(body: Html)(implicit context: app.Context) @import context._ @@ -41,7 +42,11 @@ @if(loginAccount.isEmpty){ Fork } else { - Fork + @if(isNoGroup) { + Fork + } else { + Fork + } } @repository.forkedCount @@ -189,6 +194,23 @@ } }); + @if(loginAccount.isDefined){ + $(document).on("click", "a[data-account]", function(e) { + e.preventDefault(); + var form = $('
', { + action: $(this).attr('href'), + method: "post" + }); + var account = $('', { + type: "hidden", + name: "account", + value: $(this).data('account') + }); + form.append(account); + form.submit(); + }); + } + @if(settings.ssh && loginAccount.isDefined){ $('#repository-url-http').click(function(){ $('#repository-url-proto').text('HTTP'); diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 96e4a61..f8ff085 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -1,6 +1,7 @@ @(branch: String, repository: service.RepositoryService.RepositoryInfo, pathList: List[String], + groupNames: List[String], latestCommit: util.JGitUtil.CommitInfo, files: List[util.JGitUtil.FileInfo], readme: Option[(List[String], String)], @@ -10,7 +11,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.menu("code", repository, Some(branch), pathList.isEmpty, info, error){ + @html.menu("code", repository, Some(branch), pathList.isEmpty, groupNames.isEmpty, info, error){
@helper.html.branchcontrol( branch,