kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +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

4
controllers/UsersApiController.php
View File

@@ -41,7 +41,7 @@ class UsersApiController extends BaseApiController
throw new \Exception('Request body could not be parsed (probably invalid JSON format or missing/wrong Content-Type header)');
}
$this->getUsersService()->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
$this->getUsersService()->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password'], $requestBody['picture_file_name']);
return $this->EmptyApiResponse($response);
}
catch (\Exception $ex)
@@ -79,7 +79,7 @@ class UsersApiController extends BaseApiController
try
{
$this->getUsersService()->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
$this->getUsersService()->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password'], $requestBody['picture_file_name']);
return $this->EmptyApiResponse($response);
}
catch (\Exception $ex)

7
controllers/UsersController.php
View File

@@ -22,7 +22,8 @@ class UsersController extends BaseController
{
User::checkPermission($request, User::PERMISSION_USERS_CREATE);
return $this->renderPage($response, 'userform', [
'mode' => 'create'
'mode' => 'create',
'userfields' => $this->getUserfieldsService()->GetFields('users')
]);
}
else
@@ -38,7 +39,9 @@ class UsersController extends BaseController
return $this->renderPage($response, 'userform', [
'user' => $this->getDatabase()->users($args['userId']),
'mode' => 'edit'
'mode' => 'edit',
'userfields' => $this->getUserfieldsService()->GetFields('users'),
'userfieldValues' => $this->getUserfieldsService()->GetAllValues('users')
]);
}
}