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

(refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2

Browse Source
This commit is contained in:
takezoe
2014-03-06 16:17:41 +09:00
parent c65d80bc72
commit b641bfb56a
8 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/app/UserManagementController.scala
View File

@@ -69,11 +69,11 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
get("/admin/users")(adminOnly {
val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
val users = getAllUsers(includeRemoved)
val members = users.collect { case account if(account.isGroupAccount) =>
account.userName -> getGroupMembers(account.userName).map(_._1)
val users = getAllUsers(includeRemoved)
val members = users.collect { case account if(account.isGroupAccount) =>
account.userName -> getGroupMembers(account.userName).map(_.userName)
}.toMap
admin.users.html.list(users, members, includeRemoved)
})
@@ -181,9 +181,10 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
}
})
post("/admin/users/_usercheck")(adminOnly {
// TODO Move to other generic controller?
post("/admin/users/_usercheck"){
getAccountByUserName(params("userName")).isDefined
})
}
private def members: Constraint = new Constraint(){
override def validate(name: String, value: String, messages: Messages): Option[String] = {