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

(refs #8)Start to implement group management.

Browse Source
This commit is contained in:
takezoe
2013-07-22 22:22:49 +09:00
parent f5d69a3df6
commit 30eb949ce1
7 changed files with 92 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/app/RepositorySettingsController.scala
View File

@@ -60,9 +60,10 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
/**
* JSON API for collaborator completion.
*/
// TODO Merge with UserManagementController
get("/:owner/:repository/settings/collaborators/proposals")(usersOnly {
contentType = formats("json")
org.json4s.jackson.Serialization.write(Map("options" -> getAllUsers.map(_.userName).toArray))
org.json4s.jackson.Serialization.write(Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray))
})
/**

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

@@ -68,5 +68,18 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
} getOrElse NotFound
})
get("/admin/users/_newgroup"){
admin.users.html.group(None)
}
/**
* JSON API for collaborator completion.
*/
// TODO Merge with RepositorySettingsController
get("/admin/users/_members"){
contentType = formats("json")
org.json4s.jackson.Serialization.write(Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray))
}
}