Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 10:57:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2040)Fix permission check for the repository menu

Browse Source
This commit is contained in:
Naoki Takezoe
2018-06-05 12:36:50 +09:00
parent 8068bb41ca
commit ea547a43a5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/gitbucket/core/service/RepositoryService.scala
View File

@@ -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.