wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15564 from nextcloud/fix/noid/rephrase-unclear-error-msg

Browse source 
User management/subadmin: rephrase ambiguous error message
This commit is contained in:
Roeland Jago Douma 2019-05-16 19:47:51 +02:00 committed by GitHub
commit 58658f1c78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/provisioning_api/lib/Controller/UsersController.php
View file

@ -773,7 +773,7 @@ class UsersController extends AUserData {
if (count($userSubAdminGroups) <= 1) {
// Subadmin must not be able to remove a user from all their subadmin groups.
throw new OCSException('Cannot remove user from this group as this is the only remaining group you are a SubAdmin of', 105);
throw new OCSException('Not viable to remove user from the last group you are SubAdmin of', 105);
}
}

2
apps/provisioning_api/tests/Controller/UsersControllerTest.php
View file

@ -2516,7 +2516,7 @@ class UsersControllerTest extends TestCase {
/**
* @expectedException \OCP\AppFramework\OCS\OCSException
* @expectedExceptionCode 105
* @expectedExceptionMessage Cannot remove user from this group as this is the only remaining group you are a SubAdmin of
* @expectedExceptionMessage Not viable to remove user from the last group you are SubAdmin of
*/
public function testRemoveFromGroupAsSubAdminFromLastSubAdminGroup() {
$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();