From 5b6ce4a6ab2fe3a8fdbe60c459bed948d6f3993d Mon Sep 17 00:00:00 2001 From: Vivek Date: Fri, 18 Oct 2019 17:07:57 +0530 Subject: [PATCH] [Enhancement #1232 : Added option for showing records per page in configuration.] --- packages/Webkul/Admin/src/Config/system.php | 6 ++++++ packages/Webkul/Admin/src/Resources/lang/ar/app.php | 1 + packages/Webkul/Admin/src/Resources/lang/en/app.php | 1 + packages/Webkul/Ui/src/DataGrid/DataGrid.php | 2 ++ 4 files changed, 10 insertions(+) diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index 881dc98f7..ddebc454f 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -106,6 +106,12 @@ return [ ] ], 'channel_based' => true, + ], [ + 'name' => 'admin_page_limit', + 'title' => 'admin::app.admin.system.admin-page-limit', + 'type' => 'text', + 'validation' => 'required|numeric|max:2', + 'channel_based' => true, ] ] ], [ diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 5f16d105a..ef8a81b11 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -896,6 +896,7 @@ return [ 'footer-content' => 'Footer Text', 'locale-options' => 'Unit Options', 'weight-unit' => 'Weight Unit', + 'admin-page-limit' => 'العناصر الافتراضية لكل صفحة (المشرف)', 'design' => 'Design', 'admin-logo' => 'Admin Logo', 'logo-image' => 'Logo Image', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index df9567614..5ecafc051 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -1185,6 +1185,7 @@ return [ 'footer-toggle' => 'Toggle footer', 'locale-options' => 'Unit Options', 'weight-unit' => 'Weight Unit', + 'admin-page-limit' => 'Default Items Per Page (Admin)', 'design' => 'Design', 'admin-logo' => 'Admin Logo', 'logo-image' => 'Logo Image', diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index 76cc57e40..4a78d6ee3 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -142,6 +142,8 @@ abstract class DataGrid public function __construct() { $this->invoker = $this; + + $this->itemsPerPage = core()->getConfigData('general.general.locale_options.admin_page_limit') ?: $this->itemsPerPage; } /**