mark_story
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
mark_story
644d47c843
Fix ordering on another query that was failing on travis-ci.
2012-11-10 14:24:30 -05:00
mark_story
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
mark_story
ddd3baf703
Fix null column errors in SQLite and Postgres.
2012-11-01 21:07:29 -04:00
mark_story
1f31340a2a
Fix issue with Model::saveAssociated() and TranslateBehavior
...
When combining saveAssociated() with validate=first and
TranslateBehavior. Saving data for multiple locales was not done
correctly.
Fixes #3272
2012-10-31 23:13:56 -04:00
mark_story
414e0a3484
Fix totally incorrect test.
...
TranslateBehavior should never be overlapped with real fields.
It should only be used to add fields that don't exist on the parent
table.
2012-10-31 22:51:37 -04:00
mark_story
c24bec679b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
Ber Clausen
a7d9422c09
Test all empty array with assertSame() because assertEquals() does not check the type.
2012-10-26 19:21:51 -03:00
Ber Clausen
c741f60367
Make Model::find('first') always return an array.
2012-10-25 17:57:37 -03:00
mark_story
0b0b361e48
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
2012-10-20 20:48:11 -04:00
mark_story
888b1f4795
Fix issue with using contain() and query[contain]
...
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.
Fixes #3287
2012-10-20 14:51:52 -04:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
euromark
2dfb40bac0
remove duplicate line
2012-10-11 14:54:11 +02:00
ADmad
5de492fb25
Allow saving new records with pre specified primary key value with treebehavior.
2012-10-11 01:03:49 +05:30
euromark
b7f1740d2b
correcting coding-standards
2012-09-28 13:49:51 +02:00
mark_story
571c8bc08c
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
e8b5d81fd7
Fix quoting of field names containing -
.
...
Fixes #3165
2012-08-31 14:25:02 +01:00
mark_story
b0f2cfd1d1
Fix coding standards.
2012-08-15 20:19:08 -04:00
euromark
e1fbfcef00
fix contain for find method
2012-08-13 08:10:51 +02:00
mark_story
788cf52572
Fix saving empty values for translated fields with multiple locales
2012-08-03 22:40:38 -04:00
Christopher Vrooman
de1450763b
Added a failing test to testSavePartialFields
...
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
2012-08-03 21:19:44 -04:00
mark_story
e6ef218600
Fix associated translations being inserted.
...
Due to changes introduced in [1c0b6c076a
]
associated translations would incorrectly be saved with a value of ''.
Fixes #3057
2012-07-22 20:59:24 -04:00
mark_story
a63dd9ee9d
Fix incorrect formatting in TreeBehavior.
...
Fixes #3045
2012-07-17 21:06:41 -04:00
mark_story
a7c79e5da2
Fix warnings when deleting records that do not exist.
...
Fixes #3037
2012-07-14 15:54:07 -04:00
mark_story
5e680cb292
Add tests for translate + partial fields.
...
Refs #3009
2012-07-07 12:03:29 -04:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
0bfcd49249
Fix unbindTranslation not unbinding.
...
There were documented use cases that have never worked. Fix that.
Also rename a method so it better describes what it does.
Fixes #2913
2012-05-27 21:25:55 -04:00
mark_story
7592eb94ac
Fix test cases with postgres.
...
Setting id values confuses postgres' sequences.
2012-05-10 20:55:46 -04:30
mark_story
d9bf3cf987
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-10 20:55:46 -04:30
mark_story
d73bc6b867
Fix error in Sqlite tests.
2012-05-10 20:55:45 -04:30
mark_story
8334ebebed
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-10 20:55:45 -04:30
mark_story
597913aa5b
Fix test cases with postgres.
...
Setting id values confuses postgres' sequences.
2012-05-07 22:10:17 -04:00
mark_story
fbba3621b5
Fix additional issues with saveAll().
...
Fixes #2857
2012-05-07 21:36:28 -04:00
mark_story
a1e06b9c8b
Fix error in Sqlite tests.
2012-05-06 23:39:02 -04:00
mark_story
6c5255ac73
Fix saving translate records with saveAll()
...
Also fixes issues saving translated data with validation
disabled. By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.
Fixes #2857
2012-05-06 22:48:15 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
euromark
bc2cd00123
cake 2.2 test case fixes (assert corrections, correct class names)
2012-04-21 15:02:35 +02:00
mark_story
72c3059d94
Add missing parent calls.
...
Fixes piles of failing tests.
2012-04-15 22:20:34 -04:00
Ceeram
2b7fe21ee0
remove all Set::extract() from core and tests
2012-04-05 01:33:57 +02:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Kyle Robinson Young
90e7afbdc7
Correct parameter order of assertEquals and assertNotEquals
2012-03-22 23:37:12 -07:00
mark_story
fc234d82f1
Fix coding standards in Case/Model/Behavior.
2012-03-18 14:31:13 -04:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
euromark
973dce916a
php5 corrections
2012-02-25 19:46:07 -05:00
euromark
45112088a1
type hinting models
2012-02-25 19:46:06 -05:00
Kyle Robinson Young
4176e59e52
Typo fixes in tests
2012-02-23 15:29:53 -08:00
Kyle Robinson Young
32e7943b00
Fix merge conflict with 62f8dea
2012-02-18 04:39:32 -08:00
Mark Story
c2d753ffb4
Merge pull request #500 from shama/patch-visibility
...
Add missing visibility keywords
2012-02-21 17:36:36 -08:00