mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8926 from nextcloud/ocs-api-quota-fallback 

Return quota even if user is not initialised
This commit is contained in:
blizzz 2018-04-04 17:19:54 +02:00 committed by GitHub
parent 9c4d562808 63fa245461
commit 3678d3b14a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/provisioning_api/lib/Controller/UsersController.php
View File

@ -909,7 +909,16 @@ class UsersController extends OCSController {
'quota' => $storage['quota'],
];
} catch (NotFoundException $ex) {
$data = [];
// User fs is not setup yet
$user = $this->userManager->get($userId);
if ($user === null) {
throw new OCSException('User does not exist', 101);
}
$quota = OC_Helper::computerFileSize($user->getQuota());
$data = [
'quota' => $quota ? $quota : 'none',
'used' => 0
];
}
return $data;
}