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

Merge pull request #1851 from kounoike/pr-includegroups-option

Browse Source 
Add "include group accounts" checkbox in User management
This commit is contained in:
Naoki Takezoe
2018-01-24 01:53:20 +09:00
committed by GitHub
parent ea5834f236 987407909e
commit d9aebbda62
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
View File

@@ -331,12 +331,13 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
get("/admin/users")(adminOnly {
val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
val users = getAllUsers(includeRemoved)
val includeGroups = params.get("includeGroups").map(_.toBoolean).getOrElse(false)
val users = getAllUsers(includeRemoved, includeGroups)
val members = users.collect { case account if(account.isGroupAccount) =>
account.userName -> getGroupMembers(account.userName).map(_.userName)
}.toMap
html.userlist(users, members, includeRemoved)
html.userlist(users, members, includeRemoved, includeGroups)
})
get("/admin/users/_newuser")(adminOnly {

14
src/main/scala/gitbucket/core/service/AccountService.scala
View File

@@ -96,12 +96,14 @@ trait AccountService {
def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
if(includeRemoved){
Accounts sortBy(_.userName) list
} else {
Accounts filter (_.removed === false.bind) sortBy(_.userName) list
}
def getAllUsers(includeRemoved: Boolean = true, includeGroups: Boolean = true)(implicit s: Session): List[Account] =
{
Accounts filter { t =>
(1.bind === 1.bind) &&
(t.groupAccount === false.bind, !includeGroups) &&
(t.removed === false.bind, !includeRemoved)
} sortBy(_.userName) list
}
def isLastAdministrator(account: Account)(implicit s: Session): Boolean = {
if(account.isAdmin){

11
src/main/twirl/gitbucket/core/admin/userlist.scala.html
View File

@@ -1,4 +1,4 @@
@(users: List[gitbucket.core.model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: gitbucket.core.controller.Context)
@(users: List[gitbucket.core.model.Account], members: Map[String, List[String]], includeRemoved: Boolean, includeGroups: Boolean)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("Manage Users"){
@gitbucket.core.admin.html.menu("users"){
@@ -10,6 +10,10 @@
<input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/>
Include removed users
</label>
<label for="includeGroups">
<input type="checkbox" id="includeGroups" name="includeGroups" @if(includeGroups){checked}/>
Include group accounts
</label>
<table class="table table-bordered table-hover">
@users.map { account =>
<tr>
@@ -63,8 +67,9 @@
}
<script>
$(function(){
$('#includeRemoved').click(function(){
location.href = '@context.path/admin/users?includeRemoved=' + this.checked;
$('#includeRemoved,#includeGroups').click(function(){
location.href = '@context.path/admin/users?includeRemoved=' + $('#includeRemoved').prop('checked')
+ '&includeGroups=' + $('#includeGroups').prop('checked');
});
});
</script>