mark_story
|
5ce66d3031
|
Changing how PaginatorComponent::paginate()'s $whitelist param works. It now serves as the whitelist for fields ordering can be done on. It previously allowed you to whitelist things you passed into paginate(), which was kind of useless.
Updated tests.
Fixes #430
|
2010-12-26 21:30:43 -05:00 |
|
mark_story
|
f62a067d7c
|
Making it possible for behaviors to define paginate and paginateCount. Updated test to ensure the component calls the correct methods.
Fixes #1373
|
2010-12-26 17:40:34 -05:00 |
|
mark_story
|
ee3017599d
|
Merge branch '2.0' into 2.0-pagination
Conflicts:
cake/libs/controller/components/paginator.php
cake/libs/router.php
|
2010-12-24 14:43:11 -05:00 |
|
mark_story
|
ef77e60cb0
|
Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
|
2010-12-24 14:09:57 -05:00 |
|
mark_story
|
da46ad494b
|
Deleting duplicate tests.
Moving a test out into a separate method.
|
2010-12-19 13:53:11 -05:00 |
|
mark_story
|
cc2d8e2fec
|
Moving limit from the options to the normal paging params. This fixes a few notice errors.
|
2010-12-19 13:15:04 -05:00 |
|
mark_story
|
8c3ceff50d
|
Making paging.options only contain options that are not in the defaults. This replaces the many diffs that were calculated on each url generation between paging.options and paging.defaults.
|
2010-12-19 12:58:07 -05:00 |
|
mark_story
|
e9d3fcf5cf
|
Moving limit checking into a separate method, and adding tests.
Removing $scope from being passed down to the options, it previously only allowed additional conditions to be set.
Updated tests.
|
2010-12-19 11:58:35 -05:00 |
|
mark_story
|
108a6611a8
|
Moving validation of sorting to a separate method. This makes it easier to test, extends and read.
Tests added.
|
2010-12-19 02:12:39 -05:00 |
|
mark_story
|
7b11eeb6e0
|
Updating tests to not use the deprecated Controller::$passedArgs.
Removing messy and hard to understand defaults + whitelisting from paginate() now that it has a separate method.
|
2010-12-19 01:57:51 -05:00 |
|
mark_story
|
6b3db0a3eb
|
Pulling out parameter merging logic into a method, this allows specific typing of parameter merging (named, querystring, route). Also simplifies whitelisting of request parameters.
Tests added for merging and whitelisting.
|
2010-12-19 01:42:23 -05:00 |
|
mark_story
|
7585b2941e
|
Adding paramType to the test cases.
|
2010-12-19 00:38:20 -05:00 |
|
mark_story
|
54c52d85fb
|
Fixing failing tests in PaginatorComponent.
|
2010-12-18 17:29:47 -05:00 |
|
mark_story
|
6b9d9f4aea
|
Reapplying changes in [33d2f9a6ed] as they got lost when the paginator component was extracted.
|
2010-12-18 17:17:43 -05:00 |
|
mark_story
|
de7b324444
|
Fixing more strict warnings.
Removing & on component callbacks.
Updating incorrect method signatures.
|
2010-12-18 00:03:03 -05:00 |
|
Jeremy Harris
|
97c82e28a1
|
Fixed problems where running all tests will fail due to duplicate classes
|
2010-12-14 20:27:12 -08:00 |
|
Jeremy Harris
|
10bf41a4df
|
Merge commit '42a5ebf47b73bbdf200f0238e30e6d4893695f80' into 2.0
|
2010-12-14 19:00:26 -08:00 |
|
Jeremy Harris
|
9fa1bec0cb
|
Move Controller::paginate() into PaginatorComponent
|
2010-12-14 18:21:39 -08:00 |
|