tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4275 from Icinga/fix/zero-page-limit-loads-everything-4202 

Fix zero page limit loads everything
This commit is contained in:
Johannes Meyer 2020-11-16 13:36:59 +01:00 committed by GitHub
parent c1bb17709a 7c1886430b
commit 743d5f0e05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/PreferenceForm.php
View File

@ -289,6 +289,8 @@ class PreferenceForm extends Form
array( array(
'label' => $this->translate('Default page size'), 'label' => $this->translate('Default page size'),
'description' => $this->translate('Default number of items per page for list views'), 'description' => $this->translate('Default number of items per page for list views'),
'placeholder' => 25,
'min' => 25,
'step' => 1 'step' => 1
) )
); );

4
library/Icinga/Web/Controller.php
View File

@ -165,8 +165,8 @@ class Controller extends ModuleActionController
if ($this->userPageSize === null) { if ($this->userPageSize === null) {
$user = $this->Auth()->getUser(); $user = $this->Auth()->getUser();
if ($user !== null) { if ($user !== null) {
$pageSize = $user->getPreferences()->getValue('icingaweb', 'default_page_size', false); $pageSize = $user->getPreferences()->getValue('icingaweb', 'default_page_size');
$this->userPageSize = $pageSize !== false ? (int) $pageSize : false; $this->userPageSize = $pageSize ? (int) $pageSize : false;
} else { } else {
$this->userPageSize = false; $this->userPageSize = false;
} }