Skip to content

[BUGFIX] Fix displaying for missing title #1557

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

Merged
sebastian-meyer merged 2 commits into from
Apr 22, 2025
Merged

[BUGFIX] Fix displaying for missing title #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4454c08
Adjust displaying search hits
beatrycze-volk Mar 26, 2025
ce0e821
Iterate over results to enforce calling `offsetGet()` function
beatrycze-volk Mar 26, 2025
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
4 changes: 3 additions & 1 deletion Classes/Common/SolrPaginator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ public function __construct(
protected function updatePaginatedItems(int $itemsPerPage, int $offset): void
{
$this->solrSearch->submit($offset, $itemsPerPage);
$this->paginatedItems = $this->solrSearch->toArray();
foreach ($this->solrSearch as $item) {
$this->paginatedItems[] = $item;
}
}

protected function getTotalAmountOfItems(): int
Expand Down
5 changes: 2 additions & 3 deletions Classes/Controller/CollectionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ public function showAction(?Collection $collection = null): void
$sortableMetadata = $this->metadataRepository->findByIsSortable(true);

$solrResults = $this->documentRepository->findSolrByCollection($collection, $this->settings, $this->searchParams, $listedMetadata);
$numResults = $solrResults->getNumFound();

$itemsPerPage = $this->settings['list']['paginate']['itemsPerPage'] ?? 25;

Expand All @@ -183,8 +182,8 @@ public function showAction(?Collection $collection = null): void
$this->view->assignMultiple([ 'pagination' => $pagination, 'paginator' => $solrPaginator ]);

$this->view->assign('viewData', $this->viewData);
$this->view->assign('documents', !empty($solrResults) ? $solrResults : []);
$this->view->assign('numResults', $numResults);
$this->view->assign('countDocuments', $solrResults->count());
$this->view->assign('countResults', $solrResults->getNumFound());
$this->view->assign('collection', $collection);
$this->view->assign('page', $currentPage);
$this->view->assign('lastSearch', $this->searchParams);
Expand Down
6 changes: 2 additions & 4 deletions Classes/Controller/ListViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ public function mainAction(): void
// get all metadata records to be shown in results
$listedMetadata = $this->metadataRepository->findByIsListed(true);

$numResults = 0;
if (!empty($this->searchParams)) {
$solrResults = $this->documentRepository->findSolrWithoutCollection($this->settings, $this->searchParams, $listedMetadata);
$numResults = $solrResults->getNumFound();

$itemsPerPage = $this->settings['list']['paginate']['itemsPerPage'] ?? 25;

Expand All @@ -116,8 +114,8 @@ public function mainAction(): void
}

$this->view->assign('viewData', $this->viewData);
$this->view->assign('documents', !empty($solrResults) ? $solrResults : []);
$this->view->assign('numResults', $numResults);
$this->view->assign('countDocuments', !empty($solrResults) ? $solrResults->count() : 0);
$this->view->assign('countResults', !empty($solrResults) ? $solrResults->getNumFound() : 0);
$this->view->assign('page', $currentPage);
$this->view->assign('lastSearch', $this->searchParams);
$this->view->assign('sortableMetadata', $sortableMetadata);
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Partials/ListView/SearchHits.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
data-namespace-typo3-fluid="true">

<p class="tx-dlf-search-numHits">
<f:translate key="listview.hits" arguments="{0: '{numResults}', 1: '{documents->f:count()}'}" />
<f:translate key="listview.hits" arguments="{0: '{countResults}', 1: '{countDocuments}'}" />
</p>
</html>
2 changes: 1 addition & 1 deletion Resources/Private/Templates/ListView/Main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h2 class="tx-dlf-listview-label">
<f:variable name="action" value="main" />
<f:variable name="controller" value="ListView" />

<f:if condition="{numResults} > 0">
<f:if condition="{countResults} > 0">
<f:render partial="ListView/SortingForm" arguments="{_all}" />
<f:render partial="ListView/Results" arguments="{_all}" />
</f:if>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Templates/Search/Main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<f:render partial="ListView/SearchHits" arguments="{_all}" />
<f:variable name="action" value="search" />
<f:variable name="controller" value="Search" />
<f:if condition="{numResults} > 0">
<f:if condition="{countResults} > 0">
<f:render partial="ListView/SortingForm" arguments="{_all}" />
<f:render partial="ListView/Results" arguments="{_all}" />
</f:if>
Expand Down