From 148a3dbfd9459a36f68e5b9f184cc9a9b4b743e1 Mon Sep 17 00:00:00 2001
From: Derek Stephen McLean <delboy1978uk@gmail.com>
Date: Mon, 6 Nov 2017 12:37:09 +0100
Subject: [PATCH 1/3] Paginate Image thumbnail view to 24 images (6 rows of 4)
 per page @see https://github.com/Kunstmaan/KunstmaanBundlesCMS/issues/1632

---
 .../AdminList/MediaAdminListConfigurator.php  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
index 8d76e61545..f25c767f43 100644
--- a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
+++ b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
@@ -32,6 +32,9 @@ class MediaAdminListConfigurator extends AbstractDoctrineORMAdminListConfigurato
      */
     private $request;
 
+    /** @var int $limit */
+    private $limit;
+
     /**
      * @param EntityManager $em The entity manager
      * @param MediaManager $mediaManager The media manager
@@ -50,6 +53,10 @@ public function __construct(
         $this->setAdminType(new MediaType($mediaManager, $em));
         $this->folder = $folder;
         $this->request = $request;
+
+        // Thumbnail view should display 24 images, list view 250
+        $viewMode = $request->get('viewMode');
+        $viewMode == 'thumb-view' ? $this->setLimit(24) : $this->setLimit(250);
     }
 
     /**
@@ -112,11 +119,23 @@ public function canDelete($item)
     /**
      * @return int
      */
-    public function getLimit()
+    public function getLimit() : int
     {
-        return 250;
+        return $this->limit;
     }
 
+    /**
+     * @param int $limit
+     * @return MediaAdminListConfigurator
+     */
+    private function setLimit(int $limit): MediaAdminListConfigurator
+    {
+        $this->limit = $limit;
+        return $this;
+    }
+
+
+
     /**
      * Add item actions buttons
      */

From 92417d8812c491a94699a777d8f3be0bd6837840 Mon Sep 17 00:00:00 2001
From: Derek Stephen McLean <delboy1978uk@gmail.com>
Date: Mon, 6 Nov 2017 13:11:52 +0100
Subject: [PATCH 2/3] Removing PHP7 return types (for now)

---
 .../MediaBundle/AdminList/MediaAdminListConfigurator.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
index f25c767f43..d6f4a2b0e7 100644
--- a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
+++ b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
@@ -119,7 +119,7 @@ public function canDelete($item)
     /**
      * @return int
      */
-    public function getLimit() : int
+    public function getLimit()
     {
         return $this->limit;
     }
@@ -128,7 +128,7 @@ public function getLimit() : int
      * @param int $limit
      * @return MediaAdminListConfigurator
      */
-    private function setLimit(int $limit): MediaAdminListConfigurator
+    private function setLimit($limit)
     {
         $this->limit = $limit;
         return $this;

From 82726c2734d8d43e0503469e9c931cbce68f0a66 Mon Sep 17 00:00:00 2001
From: Derek Stephen McLean <delboy1978uk@gmail.com>
Date: Fri, 24 Nov 2017 10:50:15 +0100
Subject: [PATCH 3/3] [MediaBundle] protected setLimit, default pagination,
 docblock fix

---
 .../AdminList/MediaAdminListConfigurator.php           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
index d6f4a2b0e7..c94688f966 100644
--- a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
+++ b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php
@@ -32,7 +32,9 @@ class MediaAdminListConfigurator extends AbstractDoctrineORMAdminListConfigurato
      */
     private $request;
 
-    /** @var int $limit */
+    /**
+     * @var int $limit
+     */
     private $limit;
 
     /**
@@ -55,8 +57,8 @@ public function __construct(
         $this->request = $request;
 
         // Thumbnail view should display 24 images, list view 250
-        $viewMode = $request->get('viewMode');
-        $viewMode == 'thumb-view' ? $this->setLimit(24) : $this->setLimit(250);
+        $viewMode = $request->get('viewMode', 'thumb-view');
+        $this->limit = ($viewMode == 'thumb-view') ? 24 : 250;
     }
 
     /**
@@ -128,7 +130,7 @@ public function getLimit()
      * @param int $limit
      * @return MediaAdminListConfigurator
      */
-    private function setLimit($limit)
+    protected function setLimit($limit)
     {
         $this->limit = $limit;
         return $this;