Merge branch 'develop' into feature/api-v1

This commit is contained in:
Dane Everitt 2018-01-21 14:31:32 -06:00
commit 8dcab927e5
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
10 changed files with 41 additions and 28 deletions

View file

@ -65,7 +65,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
$instance = $this->getBuilder()->with('location')->withCount('servers');
if ($this->hasSearchTerm()) {
$instance->setSearchTerm($this->getSearchTerm());
$instance->search($this->getSearchTerm());
}
return $instance->paginate(25, $this->getColumns());