kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-09-29 19:12:24 +00:00
Code Issues Projects Releases Wiki Activity

Return empty Userfields empty (closes #1412)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-08 20:12:58 +02:00
parent 14cd6ca3bf
commit 7595d640f5
3 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/UserfieldsService.php
View File

@@ -44,6 +44,7 @@ class UserfieldsService extends BaseService
throw new \Exception('Entity does not exist or is not exposed');
}
$userfields = $this->GetFields($entity);
return $this->getDatabase()->userfield_values_resolved()->where('entity', $entity)->orderBy('name', 'COLLATE NOCASE')->fetchAll();
}
@@ -88,12 +89,21 @@ class UserfieldsService extends BaseService
throw new \Exception('Entity does not exist or is not exposed');
}
$userfields = $this->getDatabase()->userfield_values_resolved()->where('entity = :1 AND object_id = :2', $entity, $objectId)->orderBy('name', 'COLLATE NOCASE')->fetchAll();
$userfieldKeyValuePairs = [];
$userfields = $this->GetFields($entity);
$userfieldValues = $this->getDatabase()->userfield_values_resolved()->where('entity = :1 AND object_id = :2', $entity, $objectId)->orderBy('name', 'COLLATE NOCASE')->fetchAll();
$userfieldKeyValuePairs = [];
foreach ($userfields as $userfield)
{
$userfieldKeyValuePairs[$userfield->name] = $userfield->value;
$value = FindObjectInArrayByPropertyValue($userfieldValues, 'name', $userfield->name);
if ($value)
{
$userfieldKeyValuePairs[$userfield->name] = $value->value;
}
else
{
$userfieldKeyValuePairs[$userfield->name] = null;
}
}
return $userfieldKeyValuePairs;