diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 886d9c4..48b542e 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -255,12 +255,7 @@ account, members, extraMailAddresses, - context.loginAccount.exists( - x => - members.exists { member => - member.userName == x.userName && member.isManager - } - ) + isGroupManager(context.loginAccount, members) ) } @@ -272,12 +267,7 @@ if (account.isGroupAccount) Nil else getGroupsByUserName(userName), getVisibleRepositories(context.loginAccount, Some(userName)), extraMailAddresses, - context.loginAccount.exists( - x => - members.exists { member => - member.userName == x.userName && member.isManager - } - ) + isGroupManager(context.loginAccount, members) ) } } @@ -822,4 +812,13 @@ } } } + + private def isGroupManager(account: Option[Account], members: Seq[GroupMember]): Boolean = { + account.exists { account => + account.isAdmin || members.exists { member => + member.userName == account.userName && member.isManager + } + } + } + }