Fix bug of always expanding extended search form (#151)

Fix bug of always expanding extended search form
subugoe · May 20, 2019 · 4aca57b · 4aca57b
1 parent 1d26735
commit 4aca57b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Classes/Service/SolrServiceProvider.php b/Classes/Service/SolrServiceProvider.php
@@ -490,8 +490,18 @@ public function isExtendedSearch()
                         && array_key_exists($fieldInfo['id'], $this->requestArguments['q'])
                         && $this->requestArguments['q'][$fieldInfo['id']]
                     ) {
-                        $result = true;
-                        break;
+                        // Check if the request argument is an array itself (appies to field type "Range")
+                        if (is_array($this->requestArguments['q'][$fieldInfo['id']])) {
+                            foreach ($this->requestArguments['q'][$fieldInfo['id']] as $key => $value) {
+                                if ('' !== $value) {
+                                    $result = true;
+                                    break;
+                                }
+                            }
+                        } else {
+                            $result = true;
+                            break;
+                        }
                     }
                 }
             }

diff --git a/Classes/ViewHelpers/Page/ScriptViewHelper.php b/Classes/ViewHelpers/Page/ScriptViewHelper.php
@@ -81,6 +81,7 @@ public static function renderStatic(
 
             if ($scriptPath) {
                 $pageRenderer->addJsFooterLibrary($name, $scriptPath);
+
                 return '';
             }
 
@@ -93,11 +94,11 @@ public static function renderStatic(
             if ($fileNameFromArguments) {
                 $scriptPath = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Resource\FilePathSanitizer::class)->sanitize($fileNameFromArguments);
                 $pageRenderer->addJsFooterLibrary($name, $scriptPath);
-            }
-            else {
+            } else {
                 $content = $renderChildrenClosure();
                 $pageRenderer->addJsFooterInlineCode($name, $content);
             }
+
             return '';
         }
     }