adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 02:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding validation message fixes for Model::saveAll() and hasOne associations, fixes #4561

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6898 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-05-16 06:03:33 +00:00
parent 0f1e075d68
commit d9a7170808
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/model/model.php
View file

@ -1310,9 +1310,11 @@ class Model extends Overloadable {
$validationErrors[$this->id] = $this->validationErrors; $validationErrors[$this->id] = $this->validationErrors;
} }
} }
$validating = ($options['validate'] === 'only' || $options['validate'] === 'first');
if (!$options['atomic']) { if (!$options['atomic']) {
$return[] = $validates; $return[] = $validates;
} elseif (!$validates) { } elseif (!$validates && !$validating) {
break; break;
} }
} }
@ -1367,8 +1369,10 @@ class Model extends Overloadable {
if (!$options['atomic']) { if (!$options['atomic']) {
$return[$this->alias][] = $validates; $return[$this->alias][] = $validates;
} }
$validating = ($options['validate'] === 'only' || $options['validate'] === 'first');
foreach ($data as $association => $values) { foreach ($data as $association => $values) {
if (!$validates) { if (!$validates && !$validating) {
break; break;
} }
if (isset($associations[$association])) { if (isset($associations[$association])) {

35
cake/tests/cases/libs/model/model.test.php
View file

@ -2182,6 +2182,41 @@ class ModelTest extends CakeTestCase {
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
function testSaveAllHasOneValidation() {
$model = new Comment();
$model->deleteAll(true);
$this->assertEqual($model->find('all'), array());
$model->Attachment->deleteAll(true);
$this->assertEqual($model->Attachment->find('all'), array());
$model->validate = array('comment' => VALID_NOT_EMPTY);
$model->Attachment->validate = array('attachment' => VALID_NOT_EMPTY);
$model->Attachment->bind('Comment');
$this->assertFalse($model->saveAll(
array(
'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
'Attachment' => array('attachment' => '')
),
array('validate' => 'first')
));
$expected = array(
'Comment' => array('comment' => 'This field cannot be left blank'),
'Attachment' => array('attachment' => 'This field cannot be left blank')
);
$this->assertEqual($model->validationErrors, $expected);
$this->assertFalse($model->saveAll(
array(
'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
'Attachment' => array('attachment' => '')
),
array('validate' => 'only')
));
$this->assertEqual($model->validationErrors, $expected);
}
function testSaveAllAtomic() { function testSaveAllAtomic() {
$this->loadFixtures('Article', 'User'); $this->loadFixtures('Article', 'User');
$TestModel =& new Article(); $TestModel =& new Article();