kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Implemented user pictures (closes #1158)

Browse Source
This commit is contained in:
Bernd Bestel
2020-12-20 22:08:50 +01:00
parent 3f718eab60
commit 8f1ce607f7
15 changed files with 181 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/UserfieldsService.php
View File

@@ -37,15 +37,15 @@ class UserfieldsService extends BaseService
public function GetEntities()
{
$exposedDefaultEntities = $this->getOpenApiSpec()->components->internalSchemas->ExposedEntity->enum;
$userentities = [];
$userEntities = [];
$specialEntities = ['users'];
foreach ($this->getDatabase()->userentities()->orderBy('name', 'COLLATE NOCASE') as $userentity)
{
$userentities[] = 'userentity-' . $userentity->name;
$userEntities[] = 'userentity-' . $userentity->name;
}
return array_merge($exposedDefaultEntities, $userentities);
return array_merge($exposedDefaultEntities, $userEntities, $specialEntities);
}
public function GetField($fieldId)

10
services/UsersService.php
View File

@@ -4,13 +4,14 @@ namespace Grocy\Services;
class UsersService extends BaseService
{
public function CreateUser(string $username, string $firstName, string $lastName, string $password)
public function CreateUser(string $username, string $firstName, string $lastName, string $password, string $pictureFileName = null)
{
$newUserRow = $this->getDatabase()->users()->createRow([
'username' => $username,
'first_name' => $firstName,
'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_DEFAULT)
'password' => password_hash($password, PASSWORD_DEFAULT),
'picture_file_name' => $pictureFileName
]);
$newUserRow = $newUserRow->save();
$permList = [];
@@ -34,7 +35,7 @@ class UsersService extends BaseService
$row->delete();
}
public function EditUser(int $userId, string $username, string $firstName, string $lastName, string $password)
public function EditUser(int $userId, string $username, string $firstName, string $lastName, string $password, string $pictureFileName = null)
{
if (!$this->UserExists($userId))
{
@@ -46,7 +47,8 @@ class UsersService extends BaseService
'username' => $username,
'first_name' => $firstName,
'last_name' => $lastName,
'password' => password_hash($password, PASSWORD_DEFAULT)
'password' => password_hash($password, PASSWORD_DEFAULT),
'picture_file_name' => $pictureFileName
]);
}