зеркало из https://github.com/nextcloud/server.git
Merge pull request #37622 from nextcloud/group-list-numeric-userid
fix output for group:list command with numeric user ids
This commit is contained in:
Коммит
6d9f785afb
|
@ -75,6 +75,17 @@ class ListCommand extends Base {
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param IGroup $group
|
||||
* @return string[]
|
||||
*/
|
||||
public function usersForGroup(IGroup $group) {
|
||||
$users = array_keys($group->getUsers());
|
||||
return array_map(function ($userId) {
|
||||
return (string)$userId;
|
||||
}, $users);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param IGroup[] $groups
|
||||
* @return array
|
||||
|
@ -88,12 +99,12 @@ class ListCommand extends Base {
|
|||
$values = array_map(function (IGroup $group) {
|
||||
return [
|
||||
'backends' => $group->getBackendNames(),
|
||||
'users' => array_keys($group->getUsers()),
|
||||
'users' => $this->usersForGroup($group),
|
||||
];
|
||||
}, $groups);
|
||||
} else {
|
||||
$values = array_map(function (IGroup $group) {
|
||||
return array_keys($group->getUsers());
|
||||
return $this->usersForGroup($group);
|
||||
}, $groups);
|
||||
}
|
||||
return array_combine($keys, $values);
|
||||
|
|
Загрузка…
Ссылка в новой задаче