lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-28 12:27:34 +01:00
commit 2fd1838425
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/user/class/api_users.class.php
View File

@ -246,12 +246,13 @@ class Users extends DolibarrApi
* *
* @url GET /info * @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 * @return array|mixed Data without useless information
* *
* @throws RestException 401 Insufficient rights * @throws RestException 401 Insufficient rights
* @throws RestException 404 User or group not found * @throws RestException 404 User or group not found
*/ */
public function getInfo() public function getInfo($includepermissions = 0)
{ {
$apiUser = DolibarrApiAccess::$user; $apiUser = DolibarrApiAccess::$user;
@ -264,6 +265,10 @@ class Users extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
} }
if ($includepermissions) {
$this->useraccount->getRights();
}
$usergroup = new UserGroup($this->db); $usergroup = new UserGroup($this->db);
$userGroupList = $usergroup->listGroupsForUser($apiUser->id, false); $userGroupList = $usergroup->listGroupsForUser($apiUser->id, false);
if (!is_array($userGroupList)) { if (!is_array($userGroupList)) {