BugFix: Classification Store Attribute Not Displaying Correct Value In Grid (#957)

* Check to see if attribute value is an array before accessing via value.

* Remove unneeded empty check

Author: torqdev

src/Service/GridData/DataObject.php

@@ -180,13 +180,18 @@ public static function getData(AbstractObject $object, array $fields = null, str
                     }
 
                     // because the key for the classification store has not a direct getter, you have to check separately if the data is inheritable
-                    if (str_starts_with($key, '~') && empty($data[$key]['value'])) {
-                        $type = $keyParts[1];
+                    if (str_starts_with($key, '~')) {
+                        $curClassAttributeValue = $data[$key] ?? null;
+                        $isValueEmpty = is_array($curClassAttributeValue) ? empty($curClassAttributeValue['value'] ?? null) : empty($curClassAttributeValue);
 
-                        if ($type === 'classificationstore') {
-                            if (!empty($inheritedData = self::getInheritedData($object, $key, $requestedLanguage))) {
-                                $data[$dataKey] = $inheritedData['value'];
-                                $data['inheritedFields'][$dataKey] = ['inherited' => $inheritedData['parent']->getId() != $object->getId(), 'objectid' => $inheritedData['parent']->getId()];
+                        if ($isValueEmpty) {
+                            $type = $keyParts[1];
+
+                            if ($type === 'classificationstore') {
+                                if (!empty($inheritedData = self::getInheritedData($object, $key, $requestedLanguage))) {
+                                    $data[$dataKey] = $inheritedData['value'];
+                                    $data['inheritedFields'][$dataKey] = ['inherited' => $inheritedData['parent']->getId() != $object->getId(), 'objectid' => $inheritedData['parent']->getId()];
+                                }
                             }
                         }
                     }