Skip to content

Commit 2f58f9b

Browse files
authored
[Bug]: Fix Inherited data in a cstore table field in grid (#1005)
* fix cstore table grid inheritance * Add comment for clarity on inheritedValue check
1 parent e8f78ef commit 2f58f9b

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/Service/GridData/DataObject.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,16 @@ protected static function getInheritedData(Concrete $object, string $key, string
359359
}
360360

361361
$inheritedValue = self::getStoreValueForObject($parent, $key, $requestedLanguage);
362-
if ((!is_array($inheritedValue) && $inheritedValue !== null) || !empty($inheritedValue['value'])) {
362+
if (
363+
(!is_array($inheritedValue) && $inheritedValue !== null) ||
364+
(
365+
is_array($inheritedValue) &&
366+
(
367+
array_is_list($inheritedValue) || //for table field types
368+
!empty($inheritedValue['value'] ?? null)
369+
)
370+
)
371+
) {
363372
return [
364373
'parent' => $parent,
365374
'value' => $inheritedValue,

0 commit comments

Comments
 (0)