Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-09 10:32:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/compta/facture/card.php
This commit is contained in:
Laurent Destailleur
2019-01-27 18:27:58 +01:00
parent 56838bc659 97545af1fd
commit ecc30b8ffe
12 changed files with 96 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,11 +218,22 @@ class Users extends DolibarrApi
foreach ($request_data as $field => $value)
{
if ($field == 'id') continue;
$this->useraccount->$field = $value;
if ($field == 'id') continue;
// The status must be updated using setstatus() because it
// is not handled by the update() method.
if ($field == 'statut') {
$result = $this->useraccount->setstatus($value);
if ($result < 0) {
throw new RestException(500, 'Error when updating status of user: '.$this->useraccount->error);
}
} else {
$this->useraccount->$field = $value;
}
}
if ($this->useraccount->update(DolibarrApiAccess::$user) > 0)
// If there is no error, update() returns the number of affected
// rows so if the update is a no op, the return value is zezo.
if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0)
{
return $this->get($id);
}