From 21d59529504ac9aa855391912141787aaee3972a Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Mon, 14 Feb 2022 17:52:24 +0100
Subject: [PATCH] Fixed batteries stock overview page was broken when having
 any Userfield (fixes #1786)

---
 changelog/67_UNRELEASED_xxxx-xx-xx.md | 2 +-
 views/batteriesoverview.blade.php     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog/67_UNRELEASED_xxxx-xx-xx.md b/changelog/67_UNRELEASED_xxxx-xx-xx.md
index 92705431..d809db51 100644
--- a/changelog/67_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/67_UNRELEASED_xxxx-xx-xx.md
@@ -36,7 +36,7 @@
 
 ### Batteries
 
-- xxx
+- Fixed that the batteries overview page was broken when there was any battery Userfields with enabled "Show as column in tables" option
 
 ### Equipment
 
diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php
index 82ddebf6..932d7044 100644
--- a/views/batteriesoverview.blade.php
+++ b/views/batteriesoverview.blade.php
@@ -194,6 +194,12 @@
 						@if($currentBatteryEntry->due_type == 'duetoday')
 						duesoon
 						@endif
+					</td>
+
+					@include('components.userfields_tbody',
+					array( 'userfields'=> $userfields,
+					'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $currentBatteryEntry->battery_id)
+					))
 
 				</tr>
 				@endforeach