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

Fixed shopping list product userfields (fixes #1246)

Browse Source
This commit is contained in:
Bernd Bestel
2021-01-02 17:30:28 +01:00
parent fe665ac766
commit 966211b71a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
views/shoppinglist.blade.php
View File

@@ -265,7 +265,7 @@
)) ))
@include('components.userfields_tbody', array( @include('components.userfields_tbody', array(
'userfields' => $productUserfields, 'userfields' => $productUserfields,
'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->product_id) 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($productUserfieldValues, 'object_id', $listItem->product_id)
)) ))
</tr> </tr>
@@ -352,6 +352,9 @@
@include('components.userfields_thead', array( @include('components.userfields_thead', array(
'userfields' => $userfields 'userfields' => $userfields
)) ))
@include('components.userfields_thead', array(
'userfields' => $productUserfields
))
</tr> </tr>
</thead> </thead>
@@ -370,7 +373,11 @@
@include('components.userfields_tbody', array( @include('components.userfields_tbody', array(
'userfields' => $userfields, 'userfields' => $userfields,
'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->product_id) 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->id)
))
@include('components.userfields_tbody', array(
'userfields' => $productUserfields,
'userfieldValues' => FindAllObjectsInArrayByPropertyValue($productUserfieldValues, 'object_id', $listItem->product_id)
)) ))
</tr> </tr>