Merge branch 'release/3.3.5'

CHANGELOG.md

@@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.3.5 - 2023-11-09
+### Fixed
+- Temporary fix for incomplete pagination on redirects ([#85](https://github.com/studioespresso/craft-seo-fields/pull/85))
+
+
 ## 3.3.4 - 2023-10-14
 ### Fixed
-- Fixed an an error where deleted sections were still shown in the sitemap settings ([#82](https://github.com/studioespresso/craft-seo-fields/issues/82))
+- Fixed an error where deleted sections were still shown in the sitemap settings ([#82](https://github.com/studioespresso/craft-seo-fields/issues/82))
 
 
 ## 3.3.3 - 2023-09-18

composer.json

@@ -2,7 +2,7 @@
     "name": "studioespresso/craft-seo-fields",
     "description": "Fields for your SEO & OG meta data",
     "type": "craft-plugin",
-    "version": "3.3.4",
+    "version": "3.3.5",
     "keywords": [
         "craft",
         "cms",

src/controllers/CpApiController.php

@@ -103,7 +103,6 @@ public function actionRedirects()
         $page = $this->request->getQueryParam('page', 1);
         list($key, $direction) = explode("|", $sort);
 
-        $total = RedirectRecord::find()->count();
         $limit = 20;
 
         $query = RedirectRecord::find();
@@ -120,10 +119,6 @@ public function actionRedirects()
                 "redirect LIKE '%{$search}%'",
             ]);
         }
-        if ($total > $limit) {
-            $query->offset($page * 10);
-            $query->limit($limit);
-        }
         $query->orderBy($key . " " . $direction);
         $rows = [];
 
@@ -154,8 +149,13 @@ public function actionRedirects()
         }
         $nextPageUrl = self::REDIRECT_BASE;
         $prevPageUrl = self::REDIRECT_BASE;
-        $lastPage = (int)ceil($total / $limit);
-        $to = $page === $lastPage ? $total : ($total < $limit ? $total : ($page * $limit));
+
+        $from = ($page - 1) * $limit + 1;
+        $total = count($rows);
+        $lastPage = (int) ceil($total / $limit);
+        $to = $page === $lastPage ? $total : ($page * $limit);
+
+        $rows = array_slice($rows, $from - 1, $limit);
 
         return $this->asJson([
             'pagination' => [
@@ -165,7 +165,7 @@ public function actionRedirects()
                 'last_page' => (int)$lastPage,
                 'next_page_url' => $nextPageUrl,
                 'prev_page_url' => $prevPageUrl,
-                'from' => (int)(($page * $limit) - $limit) + 1,
+                'from' => (int)$from,
                 'to' => (int)$to,
             ],
             'data' => $rows,