Commit graph

86 commits

Author SHA1 Message Date
Mark Story
7467224455 Moving test case and adding doc block. 2009-12-19 19:41:25 -05:00
Mark Story
4ac0a55aff Merge branch 'virtual-fields' into 1.3-misc
Conflicts:
	cake/tests/cases/libs/controller/controller.test.php
2009-12-19 19:40:12 -05:00
Mark Story
b190e462b8 Fixing whitespacing. 2009-12-17 00:15:42 -05:00
Joël Perras
96c245c6a7 Moving list of http codes out of Controller::redirect() and into a new method, Controller::httpCodes() for better reusability. See doc blocks for usage details. 2009-12-13 18:04:55 -05:00
José Lorenzo Rodríguez
d06ff5d10a Adding support for virtual fields in conditions array 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
cf359a38b3 Re-adding ability to order by virtual fields in DboSource::order
Adding support for paginating virtual model fields in controller
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
5a58813031 Making DboSource order by virtual fields 2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
2503632327 Working on virtual fields on order clause. 2009-12-10 20:05:10 -04:30
predominant
c64389006d Removing "Long description for file" from /cake/tests tree. 2009-12-08 20:19:42 +11: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
mark_story
4bbfcbff7e Fixing limit:0 and controller::paginate. Removes possibilty to generate sql errors by inputting invalid limit options. Tests updated. Refs #264 2009-11-06 00:44:21 -05:00
Ernst Mayerhofer
0327f15395 paginator works with limit 0 now too 2009-11-05 23:44:02 -05:00
mark_story
4632402a25 Fixing controller test to run when app/views/posts/index.ctp is present. 2009-11-03 17:42:42 -05:00
mark_story
07002c8b09 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-10-03 11:44:26 -04:00
mark_story
070bbb5d0e Removing magic 'title' key in Controller::set() and View::set()
Removing Controller::$pageTitle and View::$pageTitle.
Instead you should set('title_for_layout', $val) from your view or controller.
Test cases updated.
2009-09-28 21:23:40 -04:00
mark_story
29de5e515f Allowing Controller::flash() layout to be set with a parameter. Fixes #5034 2009-08-27 23:40:36 -04:00
gwoo
062f471b7f updating App::import usage. ran each test and everything seems ok. 2009-07-25 18:27:02 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
gwoo
58b5c0d77d cleaning up some ;; 2009-06-30 19:56:15 -07:00
gwoo
f9339e3c81 simplified App::path(). Changed App::build() to handle all paths.
tests passing.
2009-06-11 09:13:16 -07:00
gwoo
c3643767bf some more updates to path handling 2009-06-10 16:13:39 -07:00
gwoo
24d78dd671 moving path configuration to App class 2009-06-07 15:24:10 -07:00
gwoo
15518b8c9a merging 1.3-misc into master 2009-05-01 14:05:46 -07:00
gwoo
db71202aac Merge branch '1.2' into 1.3 2009-05-01 08:26:02 -07:00
mark_story
c8cf1a2c5b Updating __mergeVars to correctly merge parent and child component configurations.
Applied patch from 'neilcrookes'. 
Test case added. Fixes #6325

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8157 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 01:32:20 +00:00
gwoo
ec18aac4ab Merge branch 1.2 into 1.3 2009-04-15 15:16:01 -07:00
mark_story
9491e4632d Applying patch from 'SkieDr' to fix custom find type pagination. Removes parameters from exiting paginate(). Test case added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8137 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-07 14:56:30 +00:00
davidpersson
fd7d6718a1 Updating tests to not affect other ones when run from a group
Adding NoCrossContamination group
Shortening group class names
Renaming lib_controller group
Updating test imports to include the core AppController by default
Some cosmetics




git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8123 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-21 23:55:39 +00:00
gwoo
643651fe56 Merge master in 1.3 2009-03-19 14:10:13 -07:00
davidpersson
3c3b852099 Changing package of tests from "cake.tests" to "cake".
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
davidpersson
0ead89639a Adding tests for Controller::redirect.
Proves #6200 is invalid. 
Making original tests more strict.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8110 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-16 14:07:26 +00:00
gwoo
6cb8b3d286 Merge branch 'master' into 1.3.x.x 2009-03-14 13:57:18 -07:00
mark_story
af021cb4b2 Adding Html entity conversion to all urls generated by helpers, fixing potential for merged passedArgs to create xss vectors.
Adding integer cast in paginate() to page param. 
Tests added/updated.
Fixes #6134

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8061 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-25 19:51:41 +00:00
mark_story
b1d05222b8 Adding tests to show filtering of page param when using Controller::paginate(). Refs #6134
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8054 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-24 01:59:58 +00:00
gwoo
43ad3d76e5 updating code from [8024] [8025]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8031 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-15 20:13:14 +00:00
mark_story
e045e6826a Fixing Session from being added to components array twice.
Fixing greedy mergeVars with AppController.
Tests Added
Fixes #6091

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8024 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-12 13:36:20 +00:00
nate
c7d133fc0f Removing variable name inflection from Controller::set() 2009-01-20 14:36:39 -05: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
AD7six
ce0a71aef7 fixes #5603 Duplicate first parameter from the paginator with existing url args
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7777 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 22:20:03 +00:00
gwoo
62d1f367db adding test cases to show #5553 is invalid, $uses is not merged when == null.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7718 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-09 17:03:44 +00:00
nate
300dbc5e91 Correcting how parameters and default values are merged in Controller::paginate(), fixes #5503
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7688 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-02 00:46:26 +00:00
nate
4b8acf4647 Adding 'type' key to both sets of query calls in Controller::paginate(), fixes #5441
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7680 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-29 21:19:37 +00:00
renan.saddam
a628dfa028 Added test to prove #5482 (Trying to get property of non-object).
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7665 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-26 01:37:17 +00:00
mark_story
fafb01b09d Fixing modelClass when using plugin models.
Added TestPluginPost to test_app/test_plugin
Test case added.
Closes #5459

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7641 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-22 04:10:49 +00:00
mark_story
768e25c4fd Updating Controller::paginate(). Custom paginate() and paginateCount() methods now receive $extra params similar to find('all') and find('count') do. Allows the use of things like 'contain' with custom paginate() methods.
Test case added. Closes #5433 refs #5123.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7627 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-19 00:46:20 +00:00
gwoo
7fe1a03fda fixes #5331, model alias no longer overwritten
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7515 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 01:30:09 +00:00
gwoo
e35a215883 fixes #5307, model name being overridden by class registry for no reason, thanks to vizjerai for the helpful ticket.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7501 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-25 22:33:36 +00:00
gwoo
074ede4639 adding additional case for Router::normalize() and Controller::referer() to show #5157 is invalid
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7463 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-13 18:07:52 +00:00
TommyO
570145d568 Added test to show (deprecated?) support of string status codes in redirect().
Fixed fail on string status codes in redirect().

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7410 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 11:27:53 +00:00