Merge pull request #20390 from akeneo/PIM-11354

PIM-11354: Backport PIM-11345 into 7.0
akeneo · Jan 29, 2024 · 6faa3f6 · 6faa3f6
2 parents a37922b + 1c6e869
commit 6faa3f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG-7.0.md b/CHANGELOG-7.0.md
@@ -1,5 +1,9 @@
 # 7.0.x
 
+## Bug fixes
+
+- PIM-11354 [Backport PIM-11345]: Fix views list when some views are filtered and total greater than 20
+
 # 7.0.49 (2024-01-17)
 
 # 7.0.48 (2024-01-15)

diff --git a/src/Oro/Bundle/PimDataGridBundle/Controller/Rest/DatagridViewController.php b/src/Oro/Bundle/PimDataGridBundle/Controller/Rest/DatagridViewController.php
@@ -92,7 +92,7 @@ public function indexAction(Request $request, string $alias): Response
 
         $filteredViews = $this->datagridViewFilter->filterCollection($views, 'pim.internal_api.datagrid_view.view');
 
-        $moreResults = count($filteredViews) >= $options['limit'];
+        $moreResults = count($views) >= $options['limit'];
 
         return new JsonResponse([
             'results' => $this->normalizer->normalize($filteredViews, 'internal_api'),