Skip to content

Commit

Permalink
Merge pull request #60 from spira/hotfix/search-load-nested
Browse files Browse the repository at this point in the history
Do not load nested entities in search as these have already been put …
  • Loading branch information
Jeremy Sik committed May 18, 2016
2 parents e7d483f + d0fb315 commit 45dc347
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Controllers/EntityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,9 @@ protected function makePaginated(RangeRequest $rangeRequest, $permission, $allow
}

$collection = $this->getAllEntities($limit, $offset);
$collection = $this->getWithNested($collection, $request);
}

$collection = $this->getWithNested($collection, $request);
$this->checkPermission(static::class.'@'.$permission, ['model' => $collection]);

return $this->getResponse()
Expand Down

0 comments on commit 45dc347

Please sign in to comment.