Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/has-many-improvements' into ha…
Browse files Browse the repository at this point in the history
…s-many-improvements

# Conflicts:
#	src/Laravel/src/Fields/Relationships/HasMany.php
  • Loading branch information
lee-to committed Dec 1, 2024
2 parents 26546a0 + f20759d commit 869eeb9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Laravel/src/Fields/Relationships/HasMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ protected function getTablePreview(): TableBuilderContract
->disableSaveQueryState();

// If the records are already in memory (eager load) and there is no modifier, then we take the records from memory
if(\is_null($this->modifyBuilder) && $this->getRelatedModel()?->relationLoaded($this->getRelationName()) === true) {
if (\is_null($this->modifyBuilder) && $this->getRelatedModel()?->relationLoaded($this->getRelationName()) === true) {
$items = $this->toRelatedCollection();
} else {
$resource->disableQueryFeatures();
Expand Down

0 comments on commit 869eeb9

Please sign in to comment.