kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-28 09:01:14 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to edit a user without necessarily updating the users password (closes #1942)

Browse Source
This commit is contained in:
Bernd Bestel
2022-08-27 14:54:52 +02:00
parent 7e2f30396f
commit 24c9247663
4 changed files with 67 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/UsersService.php
View File

@@ -35,7 +35,7 @@ class UsersService extends BaseService
$row->delete();
}
public function EditUser(int $userId, string $username, string $firstName, string $lastName, string $password, string $pictureFileName = null)
public function EditUser(int $userId, string $username, string $firstName, string $lastName, ?string $password, string $pictureFileName = null)
{
if (!$this->UserExists($userId))
{
@@ -43,13 +43,26 @@ class UsersService extends BaseService
}
$user = $this->getDatabase()->users($userId);
$user->update([
'username' => $username,
'first_name' => $firstName,
'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_DEFAULT),
'picture_file_name' => $pictureFileName
]);
if ($password == null || empty($password))
{
$user->update([
'username' => $username,
'first_name' => $firstName,
'last_name' => $lastName,
'picture_file_name' => $pictureFileName
]);
}
else
{
$user->update([
'username' => $username,
'first_name' => $firstName,
'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_DEFAULT),
'picture_file_name' => $pictureFileName
]);
}
}
public function GetUserSetting($userId, $settingKey)