@@ -1513,7 +1513,6 @@ class Model extends Overloadable { case 'belongsTo': if ($this->__save($this->{$association}, $values, $options)) { $data[$this->alias][$this->belongsTo[$association]['foreignKey']] = $this->{$association}->id; - unset($data[$association]); } else { $validationErrors[$association] = $this->{$association}->validationErrors; $validates = false; libs/model/model.php @@ -567,15 +567,26 @@ class Helper extends Overloadable { $result = null; - if (isset($this->data[$this->model()][$this->field()])) { - $result = $this->data[$this->model()][$this->field()]; - } elseif (isset($this->data[$this->field()]) && is_array($this->data[$this->field()])) { - if (ClassRegistry::isKeySet($this->field())) { - $model =& ClassRegistry::getObject($this->field()); - $result = $this->__selectedArray($this->data[$this->field()], $model->primaryKey); + $modelName = $this->model(); + $fieldName = $this->field(); + $modelID = $this->modelID(); + + if (is_null($fieldName)) { + $fieldName = $modelName; + $modelName = null; + } + + if (isset($this->data[$fieldName]) && $modelName === null) { + $result = $this->data[$fieldName]; + } elseif (isset($this->data[$modelName][$fieldName])) { + $result = $this->data[$modelName][$fieldName]; + } elseif (isset($this->data[$fieldName]) && is_array($this->data[$fieldName])) { + if (ClassRegistry::isKeySet($fieldName)) { + $model =& ClassRegistry::getObject($fieldName); + $result = $this->__selectedArray($this->data[$fieldName], $model->primaryKey); } - } elseif (isset($this->data[$this->model()][$this->modelID()][$this->field()])) { - $result = $this->data[$this->model()][$this->modelID()][$this->field()]; + } elseif (isset($this->data[$modelName][$modelID][$fieldName])) { + $result = $this->data[$modelName][$modelID][$fieldName]; } if (is_array($result)) { libs/view/helper.php @@ -651,6 +651,9 @@ class AuthTest extends CakeTestCase { $this->Controller->params['action'] = 'add'; $this->assertFalse($this->Controller->Auth->startup($this->Controller)); + + $this->Controller->params['action'] = 'Add'; + $this->assertFalse($this->Controller->Auth->startup($this->Controller)); } /** * testLoginRedirect method @@ -962,6 +965,25 @@ class AuthTest extends CakeTestCase { $this->Controller->Auth->startup($this->Controller); $user = $this->Controller->Auth->user(); $this->assertTrue(!!$user); + + $this->Controller->Session->del('Auth'); + Router::reload(); + Router::connect('/', array('controller' => 'people', 'action' => 'login')); + $url = '/'; + $this->Controller->params = Router::parse($url); + Router::setRequestInfo(array($this->Controller->passedArgs, array( + 'base' => null, 'here' => $url, 'webroot' => '/', 'passedArgs' => array(), + 'argSeparator' => ':', 'namedArgs' => array() + ))); + $this->Controller->data['AuthUser'] = array('username' => 'felix', 'password' => 'cake'); + $this->Controller->params['url']['url'] = substr($url, 1); + $this->Controller->Auth->initialize($this->Controller); + $this->Controller->Auth->loginAction = array('controller' => 'people', 'action' => 'login'); + $this->Controller->Auth->userModel = 'AuthUser'; + + $this->Controller->Auth->startup($this->Controller); + $user = $this->Controller->Auth->user(); + $this->assertTrue(!!$user); } /** * testAdminRoute method tests/cases/libs/controller/components/auth.test.php @@ -339,6 +339,25 @@ class NumberTreeCase extends CakeTestCase { $this->assertIdentical($validTree, true); } /** + * testAddNotIndexedByModel method + * + * @access public + * @return void + */ + function testAddNotIndexedByModel() { + extract($this->settings); + $this->Tree =& new $modelClass(); + $this->Tree->initialize(2, 2); + + $this->Tree->save(array('name' => 'testAddNotIndexed', $parentField => null)); + $result = $this->Tree->find(null, array('name', $parentField), $modelClass . '.' . $leftField . ' desc'); + $expected = array($modelClass => array('name' => 'testAddNotIndexed', $parentField => null)); + $this->assertEqual($result, $expected); + + $validTree = $this->Tree->verify(); + $this->assertIdentical($validTree, true); +} +/** * testMovePromote method * * @access public tests/cases/libs/model/behaviors/tree.test.php @@ -3741,6 +3741,25 @@ class ModelTest extends CakeTestCase { $this->assertIdentical(count($result), 1); $result = Set::extract('/Comment/article_id', $result); $this->assertTrue($result[0] === 1 || $result[0] === '1'); + + + $model->deleteAll(true); + $data = array( + 'Article' => array( + 'title' => 'Post with Author saveAlled from comment', + 'body' => 'This post will be saved with an author', + 'user_id' => 2 + ), + 'Comment' => array( + 'comment' => 'Only new comment', 'user_id' => 2 + ) + ); + $result = $model->Comment->saveAll($data, array('validate' => 'first')); + $this->assertTrue($result); + + $result = $model->find('all'); + $this->assertEqual($result[0]['Article']['title'], 'Post with Author saveAlled from comment'); + $this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment'); } /** * testSaveWithCounterCache method tests/cases/libs/model/model.test.php @@ -317,6 +317,37 @@ class HelperTest extends CakeTestCase { $this->assertEqual($this->View->fieldSuffix, null); } /** + * test getting values from Helper + * + * @return void + **/ + function testValue() { + $this->Helper->data = array('fullname' => 'This is me'); + $this->Helper->setEntity('fullname'); + $result = $this->Helper->value('fullname'); + $this->assertEqual($result, 'This is me'); + + $this->Helper->data = array('Post' => array('name' => 'First Post')); + $this->Helper->setEntity('Post.name'); + $result = $this->Helper->value('Post.name'); + $this->assertEqual($result, 'First Post'); + + $this->Helper->data = array('Post' => array(2 => array('name' => 'First Post'))); + $this->Helper->setEntity('Post.2.name'); + $result = $this->Helper->value('Post.2.name'); + $this->assertEqual($result, 'First Post'); + + $this->Helper->data = array('Post' => array(2 => array('created' => array('year' => '2008')))); + $this->Helper->setEntity('Post.2.created'); + $result = $this->Helper->value('Post.2.created'); + $this->assertEqual($result, array('year' => '2008')); + + $this->Helper->data = array('Post' => array(2 => array('created' => array('year' => '2008')))); + $this->Helper->setEntity('Post.2.created.year'); + $result = $this->Helper->value('Post.2.created.year'); + $this->assertEqual($result, '2008'); + } +/** * testFieldsWithSameName method * * @access public tests/cases/libs/view/helper.test.php @@ -614,7 +614,7 @@ class FormHelperTest extends CakeTestCase { 'minutesRegex' => 'preg:/(?:<option value="([\d]+)">0?\\1<\/option>[\r\n]*)*/', 'meridianRegex' => 'preg:/(?:<option value="(am|pm)">\\1<\/option>[\r\n]*)*/', ); - + Configure::write('Security.salt', 'foo!'); } /** @@ -1558,7 +1558,7 @@ class FormHelperTest extends CakeTestCase { $this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]); $this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]); $this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]); - + $result = $this->Form->input('prueba', array( 'type' => 'time', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008, 'maxYear' => date('Y') + 1 ,'interval' => 15 @@ -1568,7 +1568,7 @@ class FormHelperTest extends CakeTestCase { $this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]); $this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]); $this->assertPattern('#<option value="30"[^>]*>30</option>#', $result[1]); - + $result = $this->Form->input('prueba', array( 'type' => 'datetime', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008, 'maxYear' => date('Y') + 1 ,'interval' => 15 @@ -4181,6 +4181,15 @@ class FormHelperTest extends CakeTestCase { '/textarea', ); $this->assertTags($result, $expected); + + $this->Form->data = array('Model' => array('field' => 'some <strong>test</strong> data with <a href="#">HTML</a> chars')); + $result = $this->Form->textarea('Model.field', array('escape' => false)); + $expected = array( + 'textarea' => array('name' => 'data[Model][field]', 'id' => 'ModelField'), + 'some <strong>test</strong> data with <a href="#">HTML</a> chars', + '/textarea', + ); + $this->assertTags($result, $expected); } /** * testTextAreaWithStupidCharacters method tests/cases/libs/view/helpers/form.test.php d4d865d765b7580b1f905302074ccdeab5f36757 b1196f8d2eda838d2d93ee91a609a376c5a0d773 Joel Moss joel@developwithstyle.com http://github.com/joelmoss/cakephp/commit/8abb58ee7aec6c9edd35b7e37927e0b7a67f84e0 8abb58ee7aec6c9edd35b7e37927e0b7a67f84e0 2009-01-27T01:39:14-08:00 2009-01-27T01:39:14-08:00 Merge branch 'master' into pimped 36498bd93106e9663cce810c9448831a89d5df4f Joel Moss joel@developwithstyle.com