Merge pull request #1705 from bolt/feature/pager-default-records

Pager uses default listing records, if available.
bolt · Aug 11, 2020 · eb7a628 · eb7a628
2 parents 538065f + df29d54
commit eb7a628
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Controller/Frontend/ListingController.php b/src/Controller/Frontend/ListingController.php
@@ -48,6 +48,7 @@ public function listing(ContentRepository $contentRepository, string $contentTyp
             ->setCurrentPage($page);
 
         $templates = $this->templateChooser->forListing($contentType);
+        $this->twig->addGlobal('records', $records);
 
         $twigVars = [
             'records' => $records,

diff --git a/src/Twig/ContentExtension.php b/src/Twig/ContentExtension.php
@@ -479,13 +479,17 @@ public function getListTemplates(TemplateselectField $field): LaravelCollection
         return new LaravelCollection($options);
     }
 
-    public function pager(Environment $twig, Pagerfanta $records, string $template = '@bolt/helpers/_pager_basic.html.twig', string $class = 'pagination', int $surround = 3)
+    public function pager(Environment $twig, Pagerfanta $records = null, string $template = '@bolt/helpers/_pager_basic.html.twig', string $class = 'pagination', int $surround = 3)
     {
         $params = array_merge(
             $this->request->get('_route_params'),
             $this->request->query->all()
         );
 
+        if (! $records && array_key_exists('records', $twig->getGlobals())) {
+            $records = $twig->getGlobals()['records'];
+        }
+
         $context = [
             'records' => $records,
             'surround' => $surround,