From 51c9bac4054fee33b603c69e10521e2a4109af1c Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 3 May 2019 15:23:56 +0800 Subject: [PATCH] Fix pagination of closet --- app/Http/Controllers/ClosetController.php | 3 +-- resources/misc/changelogs/en/4.1.2.md | 1 + resources/misc/changelogs/zh_CN/4.1.2.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php index f775c1d0..21dd8b6e 100644 --- a/app/Http/Controllers/ClosetController.php +++ b/app/Http/Controllers/ClosetController.php @@ -50,13 +50,12 @@ class ClosetController extends Controller $closet->offset(($page - 1) * $perPage)->limit($perPage); - // Pagination + $totalPages = ceil($closet->count() / $perPage); $items = $closet->get()->map(function ($t) { $t->name = $t->pivot->item_name; return $t; }); - $totalPages = ceil($items->count() / $perPage); return json('', 0, [ 'category' => $category, diff --git a/resources/misc/changelogs/en/4.1.2.md b/resources/misc/changelogs/en/4.1.2.md index 8726703b..bf07f4b9 100644 --- a/resources/misc/changelogs/en/4.1.2.md +++ b/resources/misc/changelogs/en/4.1.2.md @@ -2,3 +2,4 @@ - Fixed possible error on update page. - Fixed style of language menu. +- Fixed pagination of closet. diff --git a/resources/misc/changelogs/zh_CN/4.1.2.md b/resources/misc/changelogs/zh_CN/4.1.2.md index 5b099a5f..2c45e748 100644 --- a/resources/misc/changelogs/zh_CN/4.1.2.md +++ b/resources/misc/changelogs/zh_CN/4.1.2.md @@ -2,3 +2,4 @@ - 修复升级页面可能的出错 - 修复语言选择菜单的样式 +- 修复衣柜的分页