From 4ff566eb2219d1405413d833a3aca09253cf2e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Mon, 11 Nov 2019 10:18:18 +0100
Subject: [PATCH] Add link to searchbar

---
 .../RequestArgumentTypeConversionTrait.php      | 17 +++++++++--------
 .../Private/Assets/scss/_searchbar.scss         | 13 +++++++++++++
 .../Private/Templates/Search/Searchbar.html     |  1 +
 .../Private/Templates/Search/Searchbox.html     |  1 +
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php b/public/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php
index ded52da3..7e7a64b4 100644
--- a/public/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php
+++ b/public/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php
@@ -74,11 +74,15 @@ trait RequestArgumentTypeConversionTrait
      */
     public function processFilterSettingsArgument(array $forcedConceptUids = [])
     {
-        if ($this->request->hasArgument('filterSettings')) {
+        /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
+        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
 
-            /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
-            $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        /** @var \EP\EpProducts\Service\FilterService $filterService */
+        $filterService = $objectManager->get(FilterService::class);
 
+        if (!$this->request->hasArgument('filterSettings')) {
+            $filterSettingsObject = $filterService->getDefaultFilterSettings($forcedConceptUids);
+        } else {
             $filterSettingsRaw = $this->request->getArgument('filterSettings');
 
             if (is_array($filterSettingsRaw)) {
@@ -117,13 +121,10 @@ trait RequestArgumentTypeConversionTrait
                 $filterSettingsObject->setConceptUids($conceptUids);
             }
 
-            /** @var \EP\EpProducts\Service\FilterService $filterService */
-            $filterService = $objectManager->get(FilterService::class);
-
             $filterService->convertDestinationData($filterSettingsObject);
-
-            $this->request->setArgument('filterSettings', $filterSettingsObject);
         }
+
+        $this->request->setArgument('filterSettings', $filterSettingsObject);
     }
 
     /**
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_searchbar.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_searchbar.scss
index 0ac16593..742472e5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_searchbar.scss
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_searchbar.scss
@@ -9,6 +9,16 @@
         z-index: 200;
         position: relative;
     }
+    .form-group {
+        margin-bottom: 0;
+    }
+
+    .searchbar__link {
+        display: block;
+        padding-top: 8px;
+        color: $typoWhite;
+    }
+
     .form-control{
 
         color:$typoWhite;
@@ -153,6 +163,9 @@
         .container{
             padding: 0 13px;
         }
+        .form-group {
+            margin-bottom: 15px;
+        }
     }
 
     @media (max-width: $smartphoneWidth) {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
index 592d9e95..a58c2663 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
@@ -67,6 +67,7 @@
                                     <div class="form-group">
                                         <label>&nbsp;</label>
                                         <button type="submit" class="btn btn-warning">Suchen <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></button>
+                                        <f:link.typolink class="searchbar__link" parameter="{settings.searchPageUid}"><small>Detailsuche <i class="fa fa-chevron-right"></i></small></f:link.typolink>
                                     </div>
                                 </div>
                             </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
index 9ce9bf56..fdae422f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
@@ -93,6 +93,7 @@
                             <div class="col-md-12">
                                 <div class="form-group">
                                     <button type="submit" class="btn btn-warning">Suchen <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></button>
+                                    <f:link.typolink class="searchbar__link" parameter="{settings.searchPageUid}"><small>Detailsuche <i class="fa fa-chevron-right"></i></small></f:link.typolink>
                                 </div>
                             </div>
                         </div>