Rebase list filter submitted refactor

alterphp · Dec 8, 2018 · 782b9a5 · 782b9a5
1 parent 5bfd818
commit 782b9a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 41 deletions.
diff --git a/src/EventListener/AbstractPostQueryBuilderSubscriber.php b/src/EventListener/AbstractPostQueryBuilderSubscriber.php
@@ -16,9 +16,20 @@ public function onPostListQueryBuilder(GenericEvent $event)
     {
         $queryBuilder = $event->getArgument('query_builder');
 
+        // Request filters
         if ($event->hasArgument('request')) {
             $this->applyRequestFilters($queryBuilder, $event->getArgument('request')->get('filters', array()));
-            $this->applyFormFilters($queryBuilder, $event->getArgument('request')->get('form_filters', array()));
+        }
+
+        // List form filters
+        if ($event->hasArgument('entity')) {
+            $entityConfig = $event->getArgument('entity');
+            if (isset($entityConfig['list']['form_filters'])) {
+                $listFormFiltersForm = $this->listFormFiltersHelper->getListFormFilters($entityConfig['list']['form_filters']);
+                if ($listFormFiltersForm->isSubmitted() && $listFormFiltersForm->isValid()) {
+                    $this->applyFormFilters($queryBuilder, $listFormFiltersForm->getData());
+                }
+            }
         }
     }
 

diff --git a/src/EventListener/PostQueryBuilderSubscriber.php b/src/EventListener/PostQueryBuilderSubscriber.php
@@ -40,46 +40,6 @@ public static function getSubscribedEvents()
         );
     }
 
-    /**
-     * Called on POST_LIST_QUERY_BUILDER event.
-     *
-     * @param GenericEvent $event
-     */
-    public function onPostListQueryBuilder(GenericEvent $event)
-    {
-        $queryBuilder = $event->getArgument('query_builder');
-
-        // Request filters
-        if ($event->hasArgument('request')) {
-            $this->applyRequestFilters($queryBuilder, $event->getArgument('request')->get('filters', array()));
-        }
-
-        // List form filters
-        if ($event->hasArgument('entity')) {
-            $entityConfig = $event->getArgument('entity');
-            if (isset($entityConfig['list']['form_filters'])) {
-                $listFormFiltersForm = $this->listFormFiltersHelper->getListFormFilters($entityConfig['list']['form_filters']);
-                if ($listFormFiltersForm->isSubmitted() && $listFormFiltersForm->isValid()) {
-                    $this->applyFormFilters($queryBuilder, $listFormFiltersForm->getData());
-                }
-            }
-        }
-    }
-
-    /**
-     * Called on POST_SEARCH_QUERY_BUILDER event.
-     *
-     * @param GenericEvent $event
-     */
-    public function onPostSearchQueryBuilder(GenericEvent $event)
-    {
-        $queryBuilder = $event->getArgument('query_builder');
-
-        if ($event->hasArgument('request')) {
-            $this->applyRequestFilters($queryBuilder, $event->getArgument('request')->get('filters', array()));
-        }
-    }
-
     /**
      * Applies request filters on queryBuilder.
      *