reset filter in case of $preselections are empt

heimrichhannot · Jul 11, 2018 · 7851c5f · 7851c5f
1 parent 3ec83aa
commit 7851c5f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/ContentElement/ContentListPreselect.php b/src/ContentElement/ContentListPreselect.php
@@ -205,19 +205,20 @@ protected function compile()
      */
     protected function preselect()
     {
+        if (null === ($filterConfig = System::getContainer()->get('huh.filter.manager')->findById($this->filterConfig->getId())) || null === ($elements = $filterConfig->getElements())) {
+            return;
+        }
+
         /** @var FilterPreselectModel $preselections */
         $preselections = System::getContainer()->get('contao.framework')->createInstance(FilterPreselectModel::class);
 
         if (null === ($preselections = $preselections->findPublishedByPidAndTableAndField($this->id, 'tl_content', 'filterPreselect'))) {
+            $filterConfig->resetData(); // reset previous filters
             return;
         }
 
         $data = System::getContainer()->get('huh.filter.util.filter_preselect')->getPreselectData($this->filterConfig->getId(), $preselections->getModels());
 
-        if (null === ($filterConfig = System::getContainer()->get('huh.filter.manager')->findById($this->filterConfig->getId())) || null === ($elements = $filterConfig->getElements())) {
-            return;
-        }
-
         $filterConfig->setData($data);
     }
 }