Merge pull request #548 from ViniTou/EZP-29114-draft-pagination-param…

…-name EZP-29114: Fix pagination parameter naming for draft, system and custom url
ezsystems · Jun 28, 2018 · b146d5b · b146d5b
2 parents f93adeb + b57e425
commit b146d5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/bundle/Controller/ContentViewController.php b/src/bundle/Controller/ContentViewController.php
@@ -52,7 +52,7 @@ class ContentViewController extends Controller
     private $bookmarkService;
 
     /** @var int */
-    private $defaultPaginationLimit;
+    private $defaultDraftPaginationLimit;
 
     /** @var array */
     private $siteAccessLanguages;
@@ -77,7 +77,7 @@ class ContentViewController extends Controller
      * @param \EzSystems\EzPlatformAdminUi\UI\Module\Subitems\ContentViewParameterSupplier $subitemsContentViewParameterSupplier
      * @param \eZ\Publish\API\Repository\UserService $userService
      * @param \eZ\Publish\API\Repository\BookmarkService $bookmarkService
-     * @param int $defaultPaginationLimit
+     * @param int $defaultDraftPaginationLimit
      * @param array $siteAccessLanguages
      * @param int $defaultRolePaginationLimit
      * @param int $defaultPolicyPaginationLimit
@@ -92,7 +92,7 @@ public function __construct(
         SubitemsContentViewParameterSupplier $subitemsContentViewParameterSupplier,
         UserService $userService,
         BookmarkService $bookmarkService,
-        int $defaultPaginationLimit,
+        int $defaultDraftPaginationLimit,
         array $siteAccessLanguages,
         int $defaultRolePaginationLimit,
         int $defaultPolicyPaginationLimit,
@@ -106,7 +106,7 @@ public function __construct(
         $this->subitemsContentViewParameterSupplier = $subitemsContentViewParameterSupplier;
         $this->userService = $userService;
         $this->bookmarkService = $bookmarkService;
-        $this->defaultPaginationLimit = $defaultPaginationLimit;
+        $this->defaultDraftPaginationLimit = $defaultDraftPaginationLimit;
         $this->siteAccessLanguages = $siteAccessLanguages;
         $this->defaultRolePaginationLimit = $defaultRolePaginationLimit;
         $this->defaultPolicyPaginationLimit = $defaultPolicyPaginationLimit;
@@ -273,7 +273,7 @@ private function supplyDraftPagination(ContentView $view, Request $request): voi
                 'route_name' => $request->get('_route'),
                 'route_params' => $request->get('_route_params'),
                 'page' => $page['version_draft'] ?? 1,
-                'limit' => $this->defaultPaginationLimit,
+                'limit' => $this->defaultDraftPaginationLimit,
             ],
         ]);
     }

diff --git a/src/bundle/Resources/config/services/controllers.yml b/src/bundle/Resources/config/services/controllers.yml
@@ -64,7 +64,7 @@ services:
     EzSystems\EzPlatformAdminUiBundle\Controller\ContentViewController:
         parent: EzSystems\EzPlatformAdminUiBundle\Controller\Controller
         arguments:
-            $defaultPaginationLimit: '$pagination.version_draft_limit$'
+            $defaultDraftPaginationLimit: '$pagination.version_draft_limit$'
             $siteAccessLanguages: '$languages$'
             $defaultRolePaginationLimit: '$pagination.content_role_limit$'
             $defaultPolicyPaginationLimit: '$pagination.content_policy_limit$'