Skip to content

Fixed pagination bug #2231

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

Open
Eric-Wasson wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fixed pagination bug #2231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 19 additions & 10 deletions src/dba/AbstractModelFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ private function filterWithJoin(array $options): array|AbstractModel {
if (array_key_exists(Factory::FILTER, $options)) {
$query .= $this->applyFilters($vals, $options[Factory::FILTER]);
}

// Apply order filter
if (!array_key_exists(Factory::ORDER, $options)) {
// Add a asc order on the primary keys as a standard
Expand All @@ -706,7 +706,7 @@ private function filterWithJoin(array $options): array|AbstractModel {
$dbh = self::getDB();
$stmt = $dbh->prepare($query);
$stmt->execute($vals);

$res = array();
$values = array();
foreach ($factories as $factory) {
Expand Down Expand Up @@ -816,20 +816,29 @@ private function applyFilters(&$vals, Filter|array $filters, bool $isJoinFilter
continue;
}
$v = $filter->getValue();
if (is_array($v)) {
foreach ($v as $val) {
$vals[] = $val;
}
}
else {
$vals[] = $v;
}
$this->getAllArrayValues($vals, $v);
}
if ($isJoinFilter) {
return " AND " . implode(" AND ", $parts);
}
return " WHERE " . implode(" AND ", $parts);
}

/**
* @param $vals
* @param $element
* @return array
*/
private function getAllArrayValues(&$vals, $element) {
if (!is_array($element)) {
$vals[] = $element;
return;
}

foreach($element as $v) {
$this->getAllArrayValues($vals, $v);
}
}

/**
* @param $orders Order|Order[]
Expand Down
Loading