Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.x] Remove duplication of code in search:results tag, and treat pagination params as integer types #8314

Merged
merged 5 commits into from
Jun 29, 2023
Merged

[4.x] Remove duplication of code in search:results tag, and treat pagination params as integer types #8314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9f933f
Handle search results tag turning PlainResult and Result types
ryanmitchell Jun 16, 2023
21cee6d
Fix bug when results are not paginated
ryanmitchell Jun 16, 2023
03e7795
Undo unnecessary change
ryanmitchell Jun 28, 2023
4dad9f0
Remove uses that arent needed
ryanmitchell Jun 28, 2023
b71258a
Merge branch '4.x' into fix/search-results-tag
jasonvarga Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Search/Tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ public function results()
$builder = Search::index($this->params->get('index'))
->ensureExists()
->search($query)
->withData($supplementData)
->limit($this->params->get('limit'))
->offset($this->params->get('offset'));
->withData($supplementData);

$this->querySite($builder);
$this->queryStatus($builder);
Expand Down
6 changes: 3 additions & 3 deletions src/Tags/Concerns/GetsQueryResults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ protected function results($query)
{
$this->setPaginationParameterPrecedence();

if ($paginate = $this->params->get('paginate')) {
if ($paginate = $this->params->int('paginate')) {
return $this->paginatedResults($query, $paginate);
}

if ($limit = $this->params->get('limit')) {
if ($limit = $this->params->int('limit')) {
$query->limit($limit);
}

if ($offset = $this->params->get('offset')) {
if ($offset = $this->params->int('offset')) {
$query->offset($offset);
}

Expand Down