From 1652c4e027ac9e15007cfe8eaa4d49b7f4848d64 Mon Sep 17 00:00:00 2001 From: seto Date: Wed, 26 Jun 2024 11:56:19 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=83=BB=E3=82=AB?= =?UTF-8?q?=E3=83=86=E3=82=B4=E3=83=AA=20=E3=83=9A=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=8D=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Controller/Admin/UploaderCategoriesController.php | 6 ++++++ .../src/Controller/Admin/UploaderFilesController.php | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/bc-uploader/src/Controller/Admin/UploaderCategoriesController.php b/plugins/bc-uploader/src/Controller/Admin/UploaderCategoriesController.php index 9baa227b91..3bf71d14dd 100755 --- a/plugins/bc-uploader/src/Controller/Admin/UploaderCategoriesController.php +++ b/plugins/bc-uploader/src/Controller/Admin/UploaderCategoriesController.php @@ -15,6 +15,7 @@ use BaserCore\Annotation\NoTodo; use BaserCore\Annotation\Checked; use BaserCore\Annotation\UnitTest; +use BaserCore\Utility\BcSiteConfig; use BcUploader\Service\UploaderCategoriesService; use BcUploader\Service\UploaderCategoriesServiceInterface; use Cake\ORM\Exception\PersistenceFailedException; @@ -37,6 +38,11 @@ class UploaderCategoriesController extends BcAdminAppController */ public function index(UploaderCategoriesServiceInterface $service) { + $this->setViewConditions('UploadCategory', [ + 'default' => [ + 'query' => [ + 'limit' => BcSiteConfig::get('admin_list_num'), + ]]]); $this->set(['uploaderCategories' => $this->paginate($service->getIndex())]); } diff --git a/plugins/bc-uploader/src/Controller/Admin/UploaderFilesController.php b/plugins/bc-uploader/src/Controller/Admin/UploaderFilesController.php index 7b1e88432e..d76e93579d 100755 --- a/plugins/bc-uploader/src/Controller/Admin/UploaderFilesController.php +++ b/plugins/bc-uploader/src/Controller/Admin/UploaderFilesController.php @@ -59,7 +59,7 @@ public function index(UploaderFilesAdminServiceInterface $service) $this->setViewConditions('UploadFile', [ 'default' => [ 'query' => [ - 'num' => BcSiteConfig::get('admin_list_num'), + 'limit' => BcSiteConfig::get('admin_list_num'), 'uploader_type' => 'all' ]]]); $this->setRequest($this->getRequest()->withParsedBody($this->getRequest()->getQueryParams())); @@ -99,7 +99,7 @@ public function ajax_list(UploaderFilesAdminServiceInterface $service, int $id = $this->setViewConditions('UploadFile', [ 'default' => [ 'query' => [ - 'num' => BcSiteConfig::get('admin_list_num') + 'limit' => BcSiteConfig::get('admin_list_num'), ]], 'type' => 'get' ]);