Skip to content

Commit e520fbb

Browse files
authored
Merge pull request #1300 from rpbaltazar/1299-include-scoped-relationships
[Resolves #1299] Fix missing scoped association
2 parents 4cc67a4 + 0280f70 commit e520fbb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lib/jsonapi/resource.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,8 @@ def preload_included_fragments(resources, records, serializer, options)
13541354
rel_id = row[index+1]
13551355
assoc_rels = res.preloaded_fragments[rel_name]
13561356
if index == path.length - 1
1357-
assoc_rels[rel_id] = target_resources[klass.name].fetch(rel_id)
1357+
association_res = target_resources[klass.name].fetch(rel_id, nil)
1358+
assoc_rels[rel_id] = association_res if association_res
13581359
else
13591360
res = assoc_rels[rel_id]
13601361
end

0 commit comments

Comments
 (0)