github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-08 04:04:33 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed api query total not taking filters into account

Browse Source
This commit is contained in:
Dan Brown
2020-04-25 21:37:52 +01:00
parent 8fb1f7c361
commit a17b82bdde
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Api/ListingResponseBuilder.php
View File

@ -36,6 +36,8 @@ class ListingResponseBuilder
*/ */
public function toResponse() public function toResponse()
{ {
$this->applyFiltering($this->query);
$total = $this->query->count(); $total = $this->query->count();
$data = $this->fetchData(); $data = $this->fetchData();
@ -52,7 +54,6 @@ class ListingResponseBuilder
{ {
$this->applyCountAndOffset($this->query); $this->applyCountAndOffset($this->query);
$this->applySorting($this->query); $this->applySorting($this->query);
$this->applyFiltering($this->query);
return $this->query->get($this->fields); return $this->query->get($this->fields);
} }

4
app/Config/snappy.php
View File

@ -13,7 +13,9 @@ return [
'enabled' => true, 'enabled' => true,
'binary' => file_exists(base_path('wkhtmltopdf')) ? base_path('wkhtmltopdf') : env('WKHTMLTOPDF', false), 'binary' => file_exists(base_path('wkhtmltopdf')) ? base_path('wkhtmltopdf') : env('WKHTMLTOPDF', false),
'timeout' => false, 'timeout' => false,
'options' => [], 'options' => [
'outline' => true
],
'env' => [], 'env' => [],
], ],
'image' => [ 'image' => [