mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22854 from nextcloud/bugfix/noid/unified-search 

Bugfix/noid/unified search
This commit is contained in:
Roeland Jago Douma 2020-09-15 11:35:28 +02:00 committed by GitHub
parent 74e0b50199 d37bd2cbab
commit 2dbeb58c7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/comments/lib/Search/CommentsSearchProvider.php
View File

@ -99,13 +99,13 @@ class CommentsSearchProvider implements IProvider {
$pathInfo = pathinfo($path); $pathInfo = pathinfo($path);
$isUser = $this->userManager->userExists($result->authorId); $isUser = $this->userManager->userExists($result->authorId);
$avatarUrl = $isUser $avatarUrl = $isUser
? $this->urlGenerator->linkToRoute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42]) ? $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $result->authorId, 'size' => 42])
: $this->urlGenerator->linkToRoute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]); : $this->urlGenerator->linkToRouteAbsolute('core.GuestAvatar.getAvatar', ['guestName' => $result->authorId, 'size' => 42]);
return new SearchResultEntry( return new SearchResultEntry(
$avatarUrl, $avatarUrl,
$result->name, $result->name,
$path, $path,
$this->urlGenerator->linkToRoute('files.view.index',[ $this->urlGenerator->linkToRouteAbsolute('files.view.index',[
'dir' => $pathInfo['dirname'], 'dir' => $pathInfo['dirname'],
'scrollto' => $pathInfo['basename'], 'scrollto' => $pathInfo['basename'],
]), ]),

4
apps/files/lib/Search/FilesSearchProvider.php
View File

@ -107,14 +107,14 @@ class FilesSearchProvider implements IProvider {
array_map(function (FileResult $result) { array_map(function (FileResult $result) {
// Generate thumbnail url // Generate thumbnail url
$thumbnailUrl = $result->has_preview $thumbnailUrl = $result->has_preview
? $this->urlGenerator->linkToRoute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id]) ? $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreviewByFileId', ['x' => 32, 'y' => 32, 'fileId' => $result->id])
: ''; : '';
return new SearchResultEntry( return new SearchResultEntry(
$thumbnailUrl, $thumbnailUrl,
$result->name, $result->name,
$this->formatSubline($result), $this->formatSubline($result),
$result->link, $this->urlGenerator->getAbsoluteURL($result->link),
$result->type === 'folder' ? 'icon-folder' : $this->mimeTypeDetector->mimeTypeIcon($result->mime_type) $result->type === 'folder' ? 'icon-folder' : $this->mimeTypeDetector->mimeTypeIcon($result->mime_type)
); );
}, $this->fileSearch->search($query->getTerm())) }, $this->fileSearch->search($query->getTerm()))

7
core/Controller/UnifiedSearchController.php
View File

@ -72,9 +72,10 @@ class UnifiedSearchController extends OCSController {
public function getProviders(string $from = ''): DataResponse { public function getProviders(string $from = ''): DataResponse {
[$route, $parameters] = $this->getRouteInformation($from); [$route, $parameters] = $this->getRouteInformation($from);
return new DataResponse( $result = $this->composer->getProviders($route, $parameters);
$this->composer->getProviders($route, $parameters) $response = new DataResponse($result);
); $response->setETag(md5(json_encode($result)));
return $response;
} }
/** /**