Merge branch '1.0'

ezsystems · Oct 29, 2020 · a9d2574 · a9d2574
2 parents 4a40299 + 77f53bf
commit a9d2574
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/bundle/Form/Type/SearchType.php b/src/bundle/Form/Type/SearchType.php
@@ -45,7 +45,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('query', CoreSearchType::class, ['required' => false])
             ->add('page', HiddenType::class, ['empty_data' => 1])
             ->add('limit', HiddenType::class, [
-                'empty_data' => $this->configResolver->getParameter('pagination.search_limit'),
+                'empty_data' => $this->configResolver->getParameter('search.pagination.limit'),
             ])
             ->add('content_types', ContentTypeChoiceType::class, [
                 'multiple' => true,

diff --git a/src/bundle/Resources/config/default_settings.yaml b/src/bundle/Resources/config/default_settings.yaml
@@ -1,7 +1,7 @@
 parameters:
-    ezsettings.site.pagination.search_limit: 10
+    ezsettings.default.search.pagination.limit: 10
 
-    ezsettings.site.search_view:
+    ezsettings.site_group.search_view:
         full:
             default:
                 template: "@@ezdesign/search/index.html.twig"

diff --git a/src/lib/View/SearchViewFilter.php b/src/lib/View/SearchViewFilter.php
@@ -73,7 +73,7 @@ public function handleSearchForm(FilterViewBuilderParametersEvent $event): void
         $request = $event->getRequest();
 
         $search = $request->query->get('search');
-        $limit = isset($search['limit']) ? (int)$search['limit'] : $this->configResolver->getParameter('pagination.search_limit');
+        $limit = isset($search['limit']) ? (int)$search['limit'] : $this->configResolver->getParameter('search.pagination.limit');
         $page = isset($search['page']) ? (int)$search['page'] : 1;
         $query = $search['query'] ?? '';
         $section = null;