Browse Source

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

User management/subadmin: rephrase ambiguous error message
tags/v17.0.0beta1
Roeland Jago Douma 5 years ago
parent
commit
58658f1c78
No account linked to committer's email address

+ 1
- 1
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);
}
}


+ 1
- 1
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();

Loading…
Cancel
Save