diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-06-19 23:52:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 23:52:04 +0200 |
| commit | 7fdba6f607a9d13284c09b4c8888b671ca07d517 (patch) | |
| tree | 1e201c208403a27a006d76612f6dd695acac7cf0 /apps | |
| parent | 0cf0ef024fb2d8a6a0b1ad374cd460dc671867ee (diff) | |
| parent | a53dbb8c0b6c044b17604dfdd86b9ad951381c66 (diff) | |
| download | nextcloud-server-7fdba6f607a9d13284c09b4c8888b671ca07d517.tar.gz nextcloud-server-7fdba6f607a9d13284c09b4c8888b671ca07d517.zip | |
Merge pull request #9919 from nextcloud/immutable-groups
Don't pretend we can add/remove users to/from groups when we can't
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/provisioning_api/lib/Controller/GroupsController.php | 4 | ||||
| -rw-r--r-- | apps/provisioning_api/tests/Controller/GroupsControllerTest.php | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 765a7ea48e8..d30d0077cdc 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -115,7 +115,9 @@ class GroupsController extends AUserData { 'id' => $group->getGID(), 'displayname' => $group->getDisplayName(), 'usercount' => $group->count(), - 'disabled' => $group->countDisabled() + 'disabled' => $group->countDisabled(), + 'canAdd' => $group->canAddUser(), + 'canRemove' => $group->canRemoveUser(), ]; }, $groups); diff --git a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php index 115c9c7ba46..2ed62a67841 100644 --- a/apps/provisioning_api/tests/Controller/GroupsControllerTest.php +++ b/apps/provisioning_api/tests/Controller/GroupsControllerTest.php @@ -107,6 +107,12 @@ class GroupsControllerTest extends \Test\TestCase { $group ->method('countDisabled') ->willReturn(11); + $group + ->method('canAddUser') + ->willReturn(true); + $group + ->method('canRemoveUser') + ->willReturn(true); return $group; } @@ -215,13 +221,18 @@ class GroupsControllerTest extends \Test\TestCase { 'id' => 'group1', 'displayname' => 'group1-name', 'usercount' => 123, - 'disabled' => 11 + 'disabled' => 11, + 'canAdd' => true, + 'canRemove' => true ), Array( 'id' => 'group2', 'displayname' => 'group2-name', 'usercount' => 123, - 'disabled' => 11 + 'disabled' => 11, + 'canAdd' => true, + 'canRemove' => true + ) ]], $result->getData()); |