mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-08 06:25:51 +01:00
(refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2
This commit is contained in:
@@ -129,11 +129,10 @@ trait AccountService {
|
||||
}
|
||||
}
|
||||
|
||||
def getGroupMembers(groupName: String): List[(String, Boolean)] =
|
||||
def getGroupMembers(groupName: String): List[GroupMember] =
|
||||
Query(GroupMembers)
|
||||
.filter(_.groupName is groupName.bind)
|
||||
.sortBy(_.userName)
|
||||
.map(m => m.userName ~ m.isManager)
|
||||
.list
|
||||
|
||||
def getGroupsByUserName(userName: String): List[String] =
|
||||
|
||||
@@ -204,7 +204,7 @@ trait RepositoryService { self: AccountService =>
|
||||
|
||||
private def getRepositoryManagers(userName: String): Seq[String] =
|
||||
if(getAccountByUserName(userName).exists(_.isGroupAccount)){
|
||||
getGroupMembers(userName).filter(_._2).map(_._1)
|
||||
getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
|
||||
} else {
|
||||
Seq(userName)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user