From ea547a43a5bf6e50875939ea6ce10fa18298a373 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 5 Jun 2018 12:36:50 +0900 Subject: [PATCH] (refs #2040)Fix permission check for the repository menu --- .../gitbucket/core/service/RepositoryService.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/scala/gitbucket/core/service/RepositoryService.scala b/src/main/scala/gitbucket/core/service/RepositoryService.scala index 5381b40d7..70e238726 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala @@ -494,12 +494,13 @@ trait RepositoryService { self: AccountService => /** * TODO It seems to be able to improve performance. For example, RequestCache can be used for getAccountByUserName call. */ - private def getRepositoryManagers(userName: String, repositoryName: String)(implicit s: Session): Seq[String] = - if (getAccountByUserName(userName).exists(_.isGroupAccount)) { - getGroupMembers(userName).collect { case x if (x.isManager) => x.userName } - } else { - Seq(userName) - } ++ getCollaboratorUserNames(userName, repositoryName, Seq(Role.ADMIN)) + private def getRepositoryManagers(userName: String, repositoryName: String)(implicit s: Session): Seq[String] = { + (if (getAccountByUserName(userName).exists(_.isGroupAccount)) { + getGroupMembers(userName).collect { case x if (x.isManager) => x.userName } + } else { + Seq(userName) + }) ++ getCollaboratorUserNames(userName, repositoryName, Seq(Role.ADMIN)) + } /** * Updates the last activity date of the repository.