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

Test/review/rework (and hopefully finalized) new price handling

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-10 18:11:33 +01:00
parent 33a6a28208
commit 68eeb07e5f
44 changed files with 461 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/GenericEntityApiController.php
View File

@@ -116,8 +116,7 @@ class GenericEntityApiController extends BaseApiController
$userfields = null;
}
$object = $this->getDatabase()->{$args['entity']}
($args['objectId']);
$object = $this->getDatabase()->{$args['entity']}($args['objectId']);
if ($object == null)
{
@@ -136,8 +135,7 @@ class GenericEntityApiController extends BaseApiController
public function GetObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
$objects = $this->getDatabase()->{$args['entity']}
();
$objects = $this->getDatabase()->{$args['entity']}();
$allUserfields = $this->getUserfieldsService()->GetAllValues($args['entity']);
foreach ($objects as $object)
@@ -184,13 +182,11 @@ class GenericEntityApiController extends BaseApiController
{
try
{
return $this->FilteredApiResponse($response, $this->getDatabase()->{$args['entity']}
()->where('name LIKE ?', '%' . $args['searchString'] . '%'), $request->getQueryParams());
return $this->FilteredApiResponse($response, $this->getDatabase()->{$args['entity']}(), $request->getQueryParams());
}
catch (\PDOException $ex)
{
throw new HttpBadRequestException($request, $ex->getMessage(), $ex);
//return $this->GenericErrorResponse($response, 'The given entity has no field "name"', $ex);
}
}
else