Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #241)Work for specifying group manager

Browse Source
This commit is contained in:
takezoe
2014-03-04 04:25:44 +09:00
parent 17920e1195
commit e3fd564efd
13 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/app/AccountController.scala
View File

@@ -53,8 +53,8 @@ trait AccountControllerBase extends AccountManagementControllerBase {
// Members
case "members" if(account.isGroupAccount) => {
val members = getGroupMembers(account.userName)
_root_.account.html.members(account, members,
context.loginAccount.exists(x => members.contains(x.userName)))
_root_.account.html.members(account, members.map(_._1),
context.loginAccount.exists(x => members.exists { case (userName, isManager) => userName == x.userName && isManager }))
}
// Repositories
@@ -63,7 +63,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
_root_.account.html.repositories(account,
if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)),
context.loginAccount.exists(x => members.contains(x.userName)))
context.loginAccount.exists(x => members.exists { case (userName, isManager) => userName == x.userName && isManager }))
}
}
} getOrElse NotFound