Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
2fd1838425
@ -246,12 +246,13 @@ class Users extends DolibarrApi
|
||||
*
|
||||
* @url GET /info
|
||||
*
|
||||
* @param int $includepermissions Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
|
||||
* @return array|mixed Data without useless information
|
||||
*
|
||||
* @throws RestException 401 Insufficient rights
|
||||
* @throws RestException 404 User or group not found
|
||||
*/
|
||||
public function getInfo()
|
||||
public function getInfo($includepermissions = 0)
|
||||
{
|
||||
$apiUser = DolibarrApiAccess::$user;
|
||||
|
||||
@ -264,6 +265,10 @@ class Users extends DolibarrApi
|
||||
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
|
||||
}
|
||||
|
||||
if ($includepermissions) {
|
||||
$this->useraccount->getRights();
|
||||
}
|
||||
|
||||
$usergroup = new UserGroup($this->db);
|
||||
$userGroupList = $usergroup->listGroupsForUser($apiUser->id, false);
|
||||
if (!is_array($userGroupList)) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user