adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5981 from cakephp/issue-5973

Browse source 
Make maxLimit and limit settings independent.
This commit is contained in:
José Lorenzo Rodríguez 2015-03-01 19:48:26 +01:00
commit a6ceec149a
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Cake/Controller/Component/PaginatorComponent.php
View file

@ -333,15 +333,13 @@ class PaginatorComponent extends Component {
if (isset($this->settings[$alias])) { if (isset($this->settings[$alias])) {
$defaults = $this->settings[$alias]; $defaults = $this->settings[$alias];
} }
if (isset($defaults['limit']) && $defaults += array(
(empty($defaults['maxLimit']) || $defaults['limit'] > $defaults['maxLimit']) 'page' => 1,
) { 'limit' => 20,
$defaults['maxLimit'] = $defaults['limit']; 'maxLimit' => 100,
} 'paramType' => 'named'
return array_merge(
array('page' => 1, 'limit' => 20, 'maxLimit' => 100, 'paramType' => 'named'),
$defaults
); );
return $defaults;
} }
/** /**

4
lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
View file

@ -853,7 +853,7 @@ class PaginatorComponentTest extends CakeTestCase {
'paramType' => 'named', 'paramType' => 'named',
); );
$result = $this->Paginator->mergeOptions('Post'); $result = $this->Paginator->mergeOptions('Post');
$expected = array('page' => 1, 'limit' => 200, 'maxLimit' => 200, 'paramType' => 'named'); $expected = array('page' => 1, 'limit' => 200, 'maxLimit' => 100, 'paramType' => 'named');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$this->Paginator->settings = array( $this->Paginator->settings = array(
@ -872,7 +872,7 @@ class PaginatorComponentTest extends CakeTestCase {
'paramType' => 'named', 'paramType' => 'named',
); );
$result = $this->Paginator->mergeOptions('Post'); $result = $this->Paginator->mergeOptions('Post');
$expected = array('page' => 1, 'limit' => 500, 'maxLimit' => 150, 'paramType' => 'named'); $expected = array('page' => 1, 'limit' => 500, 'maxLimit' => 100, 'paramType' => 'named');
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }