fix: [instance:searchAll] Get the correct count if after filter is applied
parent
8450e83607
commit
bc04fd0336
|
@ -124,13 +124,16 @@ class InstanceTable extends AppTable
|
||||||
if (!empty($tableConfig['contain'])) {
|
if (!empty($tableConfig['contain'])) {
|
||||||
$query->contain($tableConfig['contain']);
|
$query->contain($tableConfig['contain']);
|
||||||
}
|
}
|
||||||
$results[$tableName]['amount'] = $query->count();
|
if (empty($tableConfig['afterFind'])) {
|
||||||
|
$results[$tableName]['amount'] = $query->count();
|
||||||
|
}
|
||||||
$result = $query->limit($limit)->all()->toList();
|
$result = $query->limit($limit)->all()->toList();
|
||||||
if (!empty($result)) {
|
if (!empty($result)) {
|
||||||
if (!empty($tableConfig['afterFind'])) {
|
if (!empty($tableConfig['afterFind'])) {
|
||||||
$result = $tableConfig['afterFind']($result, $user);
|
$result = $tableConfig['afterFind']($result, $user);
|
||||||
}
|
}
|
||||||
$results[$tableName]['entries'] = $result;
|
$results[$tableName]['entries'] = $result;
|
||||||
|
$results[$tableName]['amount'] = count($result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $results;
|
return $results;
|
||||||
|
|
Loading…
Reference in New Issue