Add inheritance check for field mapping

silverstripe · Apr 7, 2021 · fe33277 · fe33277
1 parent dd4a2aa
commit fe33277
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Schema/DataObject/Resolver.php b/src/Schema/DataObject/Resolver.php
@@ -26,11 +26,19 @@ class Resolver
      */
     public static function resolve($obj, $args = [], $context = [], ?ResolveInfo $info = null)
     {
-
         $fieldName = $info->fieldName;
         $context = SchemaConfigProvider::get($context);
-        $fieldName = $context->mapFieldByClassName(get_class($obj), $fieldName);
-        $result = $fieldName ? FieldAccessor::singleton()->accessField($obj, $fieldName[1]) : null;
+        $class = get_class($obj);
+        $resolvedField = null;
+        while(!$resolvedField && $class !== DataObject::class) {
+            $resolvedField = $context->mapFieldByClassName($class, $fieldName);
+            $class = get_parent_class($class);
+        }
+
+        if (!$resolvedField) {
+            return null;
+        }
+        $result = FieldAccessor::singleton()->accessField($obj, $resolvedField[1]);
         if ($result instanceof DBField) {
             return $result->getValue();
         }