Skip to content

[stable33] fix(file-search): use default limit to search query if not provided on request body #59409

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
backportbot wants to merge 1 commit into
base: stable33
Choose a base branch
from
+7 −6
Open

[stable33] fix(file-search): use default limit to search query if not provided on request body #59409

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion apps/dav/lib/Files/FileSearchBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ private function transformQuery(Query $query, ?SearchBinaryOperator $scopeOperat
}, $query->orderBy);

$limit = $query->limit;
$maxResults = $limit->maxResults !== 0 ? (int)$limit->maxResults : 100;
$offset = $limit->firstResult;

$limitHome = false;
Expand Down Expand Up @@ -370,7 +371,7 @@ private function transformQuery(Query $query, ?SearchBinaryOperator $scopeOperat

return new SearchQuery(
$operators,
(int)$limit->maxResults,
$maxResults,
$offset,
$orders,
$this->user,
Expand Down
10 changes: 5 additions & 5 deletions apps/dav/tests/unit/Files/FileSearchBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function testSearchFilename(): void {
'name',
'foo'
),
0,
100,
0,
[],
$this->user
Expand Down Expand Up @@ -126,7 +126,7 @@ public function testSearchMimetype(): void {
'mimetype',
'foo'
),
0,
100,
0,
[],
$this->user
Expand Down Expand Up @@ -155,7 +155,7 @@ public function testSearchSize(): void {
'size',
10
),
0,
100,
0,
[],
$this->user
Expand Down Expand Up @@ -184,7 +184,7 @@ public function testSearchMtime(): void {
'mtime',
10
),
0,
100,
0,
[],
$this->user
Expand Down Expand Up @@ -213,7 +213,7 @@ public function testSearchIsCollection(): void {
'mimetype',
FileInfo::MIMETYPE_FOLDER
),
0,
100,
0,
[],
$this->user
Expand Down
Loading