Merge remote-tracking branch 'origin/master'

lyrasoft · Jan 4, 2024 · 262e6b0 · 262e6b0
2 parents 5c11e00 + 95f1178
commit 262e6b0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Module/Admin/Category/CategoryListView.php b/src/Module/Admin/Category/CategoryListView.php
@@ -51,7 +51,7 @@ public function prepare(AppContext $app, View $view): array
 
         // Prepare Items
         $page = $state->rememberFromRequest('page');
-        $limit = $state->rememberFromRequest('limit');
+        $limit = $state->rememberFromRequest('limit') ?: 30;
         $filter = (array) $state->rememberFromRequest('filter');
         $search = (array) $state->rememberFromRequest('search');
         $ordering = $state->rememberFromRequest('list_ordering') ?? static::getDefaultOrdering();

diff --git a/src/Module/Admin/Language/LanguageListView.php b/src/Module/Admin/Language/LanguageListView.php
@@ -52,7 +52,7 @@ public function prepare(AppContext $app, View $view): array
 
         // Prepare Items
         $page     = $state->rememberFromRequest('page');
-        $limit    = $state->rememberFromRequest('limit');
+        $limit    = $state->rememberFromRequest('limit') ?: 30;
         $filter   = (array) $state->rememberFromRequest('filter');
         $search   = (array) $state->rememberFromRequest('search');
         $ordering = $state->rememberFromRequest('list_ordering') ?? $this->getDefaultOrdering();

diff --git a/src/Module/Admin/Page/PageListView.php b/src/Module/Admin/Page/PageListView.php
@@ -52,7 +52,7 @@ public function prepare(AppContext $app, View $view): array
 
         // Prepare Items
         $page = $state->rememberFromRequest('page');
-        $limit = $state->rememberFromRequest('limit');
+        $limit = $state->rememberFromRequest('limit') ?: 30;
         $filter = (array) $state->rememberFromRequest('filter');
         $search = (array) $state->rememberFromRequest('search');
         $ordering = $state->rememberFromRequest('list_ordering') ?? $this->getDefaultOrdering();

diff --git a/src/Module/Admin/Tag/TagListView.php b/src/Module/Admin/Tag/TagListView.php
@@ -52,7 +52,7 @@ public function prepare(AppContext $app, View $view): array
 
         // Prepare Items
         $page = $state->rememberFromRequest('page');
-        $limit = $state->rememberFromRequest('limit');
+        $limit = $state->rememberFromRequest('limit') ?: 30;
         $filter = (array) $state->rememberFromRequest('filter');
         $search = (array) $state->rememberFromRequest('search');
         $ordering = $state->rememberFromRequest('list_ordering') ?? $this->getDefaultOrdering();

diff --git a/src/Module/Admin/User/UserListView.php b/src/Module/Admin/User/UserListView.php
@@ -66,7 +66,7 @@ public function prepare(AppContext $app, View $view): array
 
         // Prepare Items
         $page = $state->rememberFromRequest('page');
-        $limit = $state->rememberFromRequest('limit');
+        $limit = $state->rememberFromRequest('limit') ?: 30;
         $filter = (array) $state->rememberFromRequest('filter');
         $search = (array) $state->rememberFromRequest('search');
         $ordering = $state->rememberFromRequest('list_ordering') ?? $this->getDefaultOrdering();