Collection-plugin: fix redirect to listview

Author: chrizzor

Classes/Controller/CollectionController.php

@@ -154,13 +154,11 @@ public function showAction(?Collection $collection = null): void
         // If a targetPid is given, the results will be shown by Collection on the target page.
         if (!empty($this->settings['targetPid'])) {
             $this->redirect(
-                'show',
-                'Collection',
-                null,
+                'main', 'ListView', null,
                 [
-                    'collection' => $collection
-                ],
-                $this->settings['targetPid']
+                    'searchParameter' => $search,
+                    'page' => $currentPage
+                ], $this->settings['targetPid']
             );
         }
 

Classes/Controller/ListViewController.php

@@ -86,6 +86,14 @@ public function mainAction(): void
             $GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.user')->setKey('ses', 'search', $search);
         }
 
+        // extract collection(s) from collection parameter
+        $collections = [];
+        if (array_key_exists('collection', $search)) {
+            foreach(explode(',', $search['collection']) as $collectionEntry) {
+                $collections[] = $this->collectionRepository->findByUid((int) $collectionEntry);
+            }
+        }
+
         // Get current page from request data because the parameter is shared between plugins
         $currentPage = $this->requestData['page'] ?? 1;
 
@@ -96,7 +104,7 @@ public function mainAction(): void
         $listedMetadata = $this->metadataRepository->findByIsListed(true);
 
         if (!empty($search)) {
-            $solrResults = $this->documentRepository->findSolrWithoutCollection($this->settings, $search, $listedMetadata);
+            $solrResults = $this->documentRepository->findSolrByCollections($collections, $this->settings, $search, $listedMetadata);
 
             $itemsPerPage = $this->settings['list']['paginate']['itemsPerPage'] ?? 25;