Commit graph

328 commits

Author SHA1 Message Date
mark_story
d12c232d8a Merge branch '1.3' into merger
Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/lib/cake_test_case.php
2010-11-16 21:48:13 -05:00
mark_story
d56b812181 Fixing issue where an array to string conversion error could occur if you had multiple values for a model's primary key and you created a matching form. Tests added.
Fixes #1257
2010-11-04 21:08:40 -04:00
Juan Basso
b0a600f925 Merge branch '2.0-post-method' into 2.0 2010-11-03 01:42:06 -02:00
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Juan Basso
4eed660a62 Changed the form style to not affect layout. 2010-10-30 22:39:31 -02:00
Robert Sworder
593c45b6e7 Whitespace changes 2010-10-29 23:43:50 -04:00
Robert Sworder
9eb533b9f6 dateTime functions + tests 2010-10-29 23:43:50 -04:00
Robert Sworder
a876c77987 meridian function 2010-10-29 23:43:50 -04:00
Robert Sworder
d3c1e8c974 minute function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
5f0700342b hour function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
6620b3b8fc month function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
529791842c year function + tests 2010-10-29 23:43:49 -04:00
Robert Sworder
a1b1a07af2 __dateTimeSelected and day functions done, with tests 2010-10-29 23:43:48 -04:00
Robert Sworder
30f3494c98 Select function signature changed. Corresponding tests changed. 2010-10-29 23:43:48 -04:00
Robert Sworder
115c6102b9 Changes to make tests pass... 2010-10-29 23:43:48 -04:00
Juan Basso
373fa780f7 Created the method FormHelper::postLink() to create a link with form to send data via POST. This feature require javascript. 2010-10-18 21:51:17 -02:00
Juan Basso
4c106490ef Created the method FormHelper::postButton() to create a button with form to send data via POST. 2010-10-18 17:53:27 -02:00
mark_story
c35ef7dbab Making class attribute bubble down into FormHelper::__selectOption().
Fixes issue where you couldn't change the classname of checkbox options.
Fixes #1202
2010-10-16 13:32:04 -04:00
mark_story
0c070f7131 Fixing tests that were failing due to SimpleTest being less sensitive to types than PHPUnit.
Fixing tests that were failing due to XmlHelper being removed in 2.0.
2010-10-13 23:09:55 -04:00
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
6529e0e2b4 Making optiongroup elements follow the escape parameter.
Tests added.
Fixes #1191
2010-10-13 21:59:53 -04:00
mark_story
3f2109f3c3 Applying patch from 'dragonfly' to fix issue where FormHelper would always append an argument even if one was supplied.
Test Added
Fixes #1155
2010-10-13 21:36:05 -04:00
ADmad
62161203f2 Fixed issue where FormHelper::radio() and FormHelper::select() with option "multiple"=>"checkbox" would generate tag with invalid "id" attribute if a value was non alphanumeric 2010-10-10 23:16:48 +05:30
mark_story
3ab77017ae Fixing OpenTest license mentions to use MIT License
Fixing PHP versions 4 and 5 to only be PHP5.
2010-10-03 12:31:21 -04:00
mark_story
b908365f9d Changing the @license tag on test files, as tests can now be MIT like
the rest of CakePHP.
2010-10-03 12:27:27 -04:00
mark_story
6d7f2d37ab Fixing issue where fields with the exact same name as the model would result in incorrect name attributes. Tests added. Fixes #1123 2010-09-26 00:46:51 -04:00
Mark Story
d88da3d579 Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/libs/model/connection_manager.php
	cake/libs/model/model.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
Mark Story
82fffe6914 Fixing issue where FormHelper::select() with multiple = checkbox and a custom name attribute would not work correctly. Fixes #1078 2010-09-05 01:28:13 -04:00
José Lorenzo Rodríguez
f63b093d24 Merge branch '2.0-request' into 2.0
Still tons of tests failing
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/html.php
	cake/libs/view/view.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-08-27 23:31:41 -04:30
mark_story
750fe3aa05 Removing text() and password() as the new __call method handles them.
Updating test cases and adding a test for allowing a magic method to override the type.
2010-08-17 00:13:22 -04:00
mark_story
e79df23491 Adding a magic __call method to handle html5 inputs and simplify input generation logic. 2010-08-17 00:06:23 -04:00
mark_story
f46241a6e7 Merge branch '2.0' into 2.0-helpers 2010-08-16 23:02:44 -04:00
mark_story
705e90bef7 Merge branch '1.3' into 2.0-merge
Conflicts:
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
2494156e9a Removing reference operators that caused tests to fail.
Adding an alias as several tests relied on a User object being in the registry to autodetect fields.
2010-08-10 23:18:43 -04:00
mark_story
576eba3ef9 Removing ClassRegistry use from FormHelper and its test case. 2010-08-10 23:18:41 -04:00
mark_story
0e933e8893 Updating most helper test cases to use View in their constructors. 2010-08-10 23:18:38 -04:00
mark_story
1371cefc3d Applying patch from 'thatcode' to fix an issue where FormHelper::datetime() would not use 'default' or 'value' keys like other inputs would. This corrects an unintentional inconsistency in the methods. Test cases added. Fixes #988 2010-08-09 23:49:18 -04:00
mark_story
8b847cffef Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/view/helper.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:54:28 -04:00
mark_story
2020675078 Merge branch '1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
7c0cda7ce5 Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2010-06-28 23:41:48 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
f11f9ebc68 Adding test case for #867. 2010-06-28 21:32:49 -04:00
mark_story
ecf7811b7a Merge branch '2.0' into 2.0-request
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/request_handler.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
mark_story
50144d6b5b Making FormHelper clear fields on create() as well as end() this ensures that GET forms don't leak fields. Fixes #571 2010-06-12 22:50:09 -04:00
mark_story
f0d755bd8e Adding additional tests for Helper::_parseAttributes() and fixing issue where '1' would not be interpreted as a truthy value for compact attributes. Fixes #806 2010-06-10 19:11:26 -04:00
mark_story
9ee4a12a9d Adding additional tests for FormHelper::input() and checkbox generation and checked attribute being set for truthy values. Close #806 2010-06-10 12:48:55 -04:00
mark_story
e41e89cd2a Making magic select not override magic hidden. Tests added.
Fixes #782
2010-06-04 00:20:14 -04:00
mark_story
fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00