MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-20 15:23:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Start ripping out old search functionality for models

Browse Source
This commit is contained in:
Dane Everitt
2020-09-13 11:29:47 -07:00
parent 3c7ffaaadb
commit 4dddcaebb0
16 changed files with 15 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Repositories/Eloquent/EloquentRepository.php
View File

@@ -289,12 +289,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
*/
public function all(): Collection
{
$instance = $this->getBuilder();
if (is_subclass_of(get_called_class(), SearchableInterface::class) && $this->hasSearchTerm()) {
$instance = $instance->search($this->getSearchTerm());
}
return $instance->get($this->getColumns());
return $this->getBuilder()->get($this->getColumns());
}
/**
@@ -305,12 +300,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
*/
public function paginated(int $perPage): LengthAwarePaginator
{
$instance = $this->getBuilder();
if (is_subclass_of(get_called_class(), SearchableInterface::class) && $this->hasSearchTerm()) {
$instance = $instance->search($this->getSearchTerm());
}
return $instance->paginate($perPage, $this->getColumns());
return $this->getBuilder()->paginate($perPage, $this->getColumns());
}
/**