Merge pull request #2 from beatrycze-volk/fix-missing-title

[BUGFIX] Fix displaying for missing title

Author: MarcMoschSLUB

Classes/Common/SolrPaginator.php

@@ -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

Classes/Controller/CollectionController.php

@@ -177,7 +177,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;
 
@@ -188,8 +187,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);

Classes/Controller/ListViewController.php

@@ -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;
 
@@ -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);

Resources/Private/Partials/ListView/SearchHits.html

@@ -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>

Resources/Private/Templates/ListView/Main.html

@@ -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>

Resources/Private/Templates/Search/Main.html

@@ -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>