Commit graph

96 commits

Author SHA1 Message Date
Mark Story
1a387e6b8a Fixing url parameters set with options() or beforeRender not being merged on next() / prev().
Tests added. Fixes #129
This reverses the change made in efa36abdf0 which broke this behavior.
2009-12-22 19:05:06 -05:00
Mark Story
efa36abdf0 Fixing double merging of url options in paginator helper. This was causing duplicate passed url parameters in next()/prev().
Test cases added.
Fixes #391
2009-12-08 10:01:33 -05:00
mark_story
a729fc4d62 Merge branch '1.3-cache' into 1.3-misc 2009-11-21 17:16:38 -05:00
mark_story
c11509483c Removing use of Helper::output from core helpers.
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
burzum
67cea6d21c Fixing a problem with setting Paginator::sort() defaults directon to desc 2009-11-17 02:11:23 +01:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
ADmad
002a01a9d8 passedArgs from current request are auto merged with url options of paginator helper
Signed-off-by: Florian Krämer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
d63218c0a0 Fixing error in previous commit. 2009-11-03 09:52:59 -05:00
mark_story
6b043c6c57 Updating doc blocks for paginator helper. 2009-11-02 21:37:20 -05:00
mark_story
a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
00d7c655ce Improving documentation for PaginatorHelper::sort() Fixes #210 2009-10-27 13:28:43 -04:00
mark_story
e6cc81226d Merge branch '1.3-jshelper' into 1.3 2009-09-20 17:46:30 -04:00
mark_story
01cf40bf12 Adding automatic use of $options for $disabledOptions in PaginatorHelper::next() and PaginatorHelper::prev(). Thanks to 'joaquin_win' for the initial patch. Refs #83 2009-09-14 23:06:24 -04:00
mark_story
4d7fc24850 Fixing errors generated by ajaxProvider class not being loaded when checking for method implementation. 2009-08-31 11:38:31 -04:00
mark_story
7c4d60abe8 Adding patch from 'grncdr' to allow default direction to be set for sort links created with PaginatorHelper::sort. Fixes #5151 2009-08-26 23:55:19 -04:00
mark_story
4f2d415663 Applying patch from 'kuja' to give default class names to links generated by Paginator::sort().
Fixes #6239
2009-08-26 23:33:13 -04:00
mark_story
38a4b619e6 Adding default classes to next and prev links.
Switching next() and prev() to use span by default.
2009-08-26 22:55:24 -04:00
mark_story
a7e300a7c1 Adding warning errors when an incompatible class is used. 2009-08-12 09:45:42 -04:00
mark_story
b1a27b1760 Adding ability to inject an ajax provider class into paginator helper. updating tests. 2009-08-12 09:45:42 -04:00
gwoo
7fc465309e Merge branch '1.2' into 1.3 2009-08-02 11:58:39 -07:00
jperras
70c331f5db Updating doc blocks for paginator helper. Thanks to savant for the patch. Fixes #4994.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8271 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 18:55:37 +00:00
gwoo
1423b0067b Merge branch '1.2' into 1.3 2009-07-30 11:34:33 -07:00
mark_story
47cd941b53 Applying optimization patch to PaginatorHelper and test refactorings to PaginatorHelper test case. Thanks Phally. Fixes #6526
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8259 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 12:40:31 +00:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
gwoo
a9d98e73c3 Merge branch '1.2' into 1.3 2009-07-22 09:27:31 -07:00
gwoo
56bee6e1fc fixes #6507 paginator sort directions
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8239 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 01:53:14 +00:00
mark_story
76d5855d72 Applying patch from 'Phally' Fixes multiple issues in PaginatorHelper related to first and last option in numbers(). Fixes #6516
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8234 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-17 19:46:33 +00:00
gwoo
f1a4352620 Merge branch '1.2' into 1.3 2009-07-03 08:24:42 -07:00
gwoo
9e143bc335 fixes #6473, dot notation for sort in next/prev
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8213 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-02 23:48:10 +00:00
gwoo
15518b8c9a merging 1.3-misc into master 2009-05-01 14:05:46 -07:00
gwoo
ec18aac4ab Merge branch 1.2 into 1.3 2009-04-15 15:16:01 -07:00
jperras
4439bc4f70 Fixing regression in PaginatorHelper. Adding tests for PaginatorHelper::sortDir, as well as fixing incorrect test for sorting with Model.field dot notation. Fixes #6218.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8125 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-22 18:59:53 +00:00
gwoo
6cb8b3d286 Merge branch 'master' into 1.3.x.x 2009-03-14 13:57:18 -07:00
gwoo
de6541f658 fixes #6189, paginator sort direction for associated fields of the same name
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8092 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-12 17:11:08 +00:00
mariano.iglesias
fdbf102228 Fixing issue where disallowing plugin was not possible in PaginatorHelper, fixes #6159
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8090 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 19:24:06 +00:00
gwoo
f0d03a91cf Merge branch 'master' into 1.3.x.x 2009-02-09 12:01:06 -08:00
nate
c2f111a45a Standardizing format string in PaginatorHelper::counter(), %page% becomes {:page}, old keys still work, but will be deprecated 2009-02-07 08:41:15 -05:00
mark_story
e7c71b4125 Updating doc blocks in helpers. Helps generate cleaner API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8014 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-03 18:48:28 +00:00
mark_story
287968934f Fixing next()/prev() when paginating multiple models. Added tests from 'hummer'. Fixes #5970
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7989 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:08:11 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
nate
ccc602c82a Updating PaginatorHelper::options() docblock and adding test cases to demonstrate correct usage, closes #5380
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7556 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 19:10:15 +00:00
gwoo
7ce4bd4131 closes #5160, finishing tag implementation on paginator helper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7395 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 16:58:57 +00:00
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
nate
b0b9c1e4bd Adding PaginatorHelper tests for additional custom URL settings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7358 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-24 04:04:21 +00:00
phpnut
822c8978a9 Fixes #5002 Model name in PaginatorHelper sortKey.
Closes #5032
Small performance improvement in App::!__load();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7312 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 09:44:42 +00:00
phpnut
022ffa3f4f Adding fixes for pagination on associated models.
Corrected dot notation use in Controller::paginate();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7286 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 06:25:08 +00:00
mark_story
273dff46f1 reverting paginator helper back to parent::url. Closes #4887
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7171 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 12:18:54 +00:00
mark_story
0ce344d852 Minor changes to PaginatorHelper. $this->url() instead of parent::url()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7165 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 02:47:50 +00:00