Commit graph

191 commits

Author SHA1 Message Date
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11: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
0e23fdfbb3 Fixing infinitely nesting stack frames when TreeBehavior::reorder() is called and the models $cacheQueries = true and there are a sizable number of records being manipulated.
Test cases added.
Fixes #188
2009-10-21 00:22:36 -04:00
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
51e471427a Updating doc blocks to improve parsing in the API. 2009-10-05 21:01:31 -04:00
mark_story
d5376e64aa Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261 2009-09-19 01:17:20 -04:00
gwoo
bf2b8a60e6 Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
renan.saddam
76e50ef625 Adding support for Model.* syntax, which translates to a list of fields from Model.
Fixing buildColumn for null values.
Fixing small containable merge, it was duplicating values, tests added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8265 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 02:08:20 +00:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
jperras
e40428801e Removing all uses of uses() global method & replacing with require or App::import. 2009-07-24 13:41:08 -04:00
mark_story
f0752feeec Adding patch from 'burzum'. Fixes ambiguous field sql error when joining two trees with a defined scope.
Test cases and fixtures added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8178 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-26 17:17:57 +00:00
mark_story
965b8e9641 Updating doc blocks on tree behavior.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8081 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-08 17:12:30 +00:00
renan.saddam
52f4cd42db Fixing issue when Model::$translateTable is set
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8050 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-19 13:45:51 +00:00
mark_story
4b00c29eef Updating doc blocks to improve readability in API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8015 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-04 05:00:59 +00:00
AD7six
b9ea171429 fixes #6003 tree behavior fails with uuids
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7997 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-15 00:50:01 +00:00
AD7six
56afb72825 changing $model for $Model to follow conventions ($Model is an object)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7994 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:21:53 +00:00
AD7six
eec4d15898 fixes #5971 - Error generated by behavior if invoking overloaded method from within the behavior
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7993 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 23:19:59 +00:00
gwoo
3eb9f65e99 fixes #5909, return for __() for translate behavior errors
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7947 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-21 17:32:30 +00:00
AD7six
2f51ccca04 fixes #5772.
Sql errors when using reserved words for a field name with the tree behavior.
Test Case restructured to allow thorough testing of the various permutations inwhich the tree behavior can be used



git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7880 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-20 13:57:44 +00:00
renan.saddam
400fadd091 Fixing TranslateBehavior bug when $query['recursive'] is set. Fixes #5593.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7869 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-12 19:45:30 +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
gwoo
e2a5f38b36 updating translate recursive handling, fixes #5593
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7823 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-04 01:41:27 +00:00
renan.saddam
171fa62b94 Added tests to cover bug with recursive = -1. Refs #5593.
Did a refactoring to TranslateBehavior and moved all tests from translate.test.php to models.test.php

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7821 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-03 23:58:44 +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
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
renan.saddam
e3fb56f6be Fixing bug when primaryKey is not id. Fixes #5615.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7757 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-17 00:01:36 +00:00
mark_story
62168bfe0f Updating doc blocks to include access and return PHPDOC tags.
Removing use of e() in Debugger.
Fixing code formatting in CookieComponent
Closes #5477

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7662 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-25 16:49:56 +00:00
mark_story
65cbbcf019 Changing '.id' to primaryKey reference. Closes #5437
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7610 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-16 00:42:01 +00:00
phpnut
a6f19c8240 Adding fix for Model::afterFind(); not having access to $this->data when using TreeBehavior
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7586 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-09 18:42:18 +00:00
DarkAngelBGE
19d4f3d596 adding a couple 'return home early' refactorings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7572 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-08 20:33:48 +00:00
AD7six
5e11e1490b fixes #5339 incorrect bracketting for bindModel statement in tree behavior recover method. removing the actsAs key
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7526 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-27 14:05:58 +00:00
gwoo
9af76b2512 fixes #5226, locale in translate behavior
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7472 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-16 16:39:48 +00:00
gwoo
995040a98a fixes #5239, primary key for HABTM, reverts last change for #5233 which broke the tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7454 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-11 16:18:19 +00:00
AD7six
460223b61a fixes #5203 - removeFromTree should return after deleting a node with no children.
Also modified removeFromTree to set the parent_id to null if removeFromTree is called on a node with no children and
	delete is set to false


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7453 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-11 15:54:54 +00:00
gwoo
8cb73ead3c fixes #5233, uppercase fields in containable
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7452 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-11 15:11:06 +00:00
mariano.iglesias
eb02ec4ca9 Fixing issue on Containable when multiple unbindings take place on the same model, fixes #5096. Fixing notices on unmergable results on DboSource.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7424 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-02 21:56:55 +00:00
gwoo
4a94397b43 removing deprecated code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7401 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 01:04:03 +00:00
mark_story
3402f40061 Adding test case for AclBehavior. Modified AclBehavior to use $model->name for configuration and operation. Closes #5163
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7391 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 03:26:15 +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
mariano.iglesias
6eb4aba543 Changing test for Containable to reflect #4790
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7246 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-23 06:33:31 +00:00
gwoo
ca38b035b5 fixes #4790, restoring associations in Containable. Thanks to maular for the patch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7245 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-23 04:41:15 +00:00
the_undefined
95522fa3a9 Applied patch by floob, fixes #4876
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7234 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-22 12:27:54 +00:00
nate
df75a06756 Fixing coding standards violations in core, and adding misc tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
gwoo
eb67aa879e fixes #4841, TreeBehavior ambiguous columns
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7196 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-15 17:51:25 +00:00
AD7six
9d87ce5a06 minor syntax correction, changing a string condition to be an array for consistency
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7195 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-15 13:08:36 +00:00
gwoo
552af82e7b closes #4857, data validation in translate behavior, if field in model data is passed as an array. Either the data with current mode local or the first value in the array of data is used for validation purposes.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7190 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-14 23:21:09 +00:00
gwoo
e9daddddf3 fixes #4910, aclnode loading
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7179 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-13 16:40:45 +00:00