Skip to content
Permalink
Browse files

Updating Scaffold to merge hasAndBelongsToMany keys when generating f…

…ield lists for scaffolded forms. Fixes #48
  • Loading branch information...
markstory committed Aug 26, 2009
1 parent 31ec714 commit 2dca77cbcbd738217d76128dcdc3cd9a3697dcea
Showing with 68 additions and 2 deletions.
  1. +4 −0 cake/libs/controller/scaffold.php
  2. +64 −2 cake/tests/cases/libs/controller/scaffold.test.php
@@ -237,6 +237,10 @@ function __scaffoldIndex($params) {
* @access private
*/
function __scaffoldForm($action = 'edit') {
$this->controller->viewVars['scaffoldFields'] = array_merge(
$this->controller->viewVars['scaffoldFields'],
array_keys($this->ScaffoldModel->hasAndBelongsToMany)
);
$this->controller->render($action, $this->layout);
$this->_output();
}
@@ -140,6 +140,19 @@ class ScaffoldMock extends CakeTestModel {
'foreignKey' => 'article_id',
)
);
/**
* hasAndBelongsToMany property
*
* @var string
**/
var $hasAndBelongsToMany = array(
'ScaffoldTag' => array(
'className' => 'ScaffoldTag',
'foreignKey' => 'post_id',
'associationForeignKey' => 'tag_id',
'joinTable' => 'posts_tags'
)
);
}
/**
* ScaffoldUser class
@@ -195,6 +208,21 @@ class ScaffoldComment extends CakeTestModel {
)
);
}
/**
* ScaffoldTag class
*
* @package cake
* @subpackage cake.tests.cases.libs.controller
*/
class ScaffoldTag extends CakeTestModel {
/**
* useTable property
*
* @var string 'posts'
* @access public
*/
var $useTable = 'tags';
}
/**
* TestScaffoldView class
*
@@ -226,7 +254,7 @@ class ScaffoldViewTest extends CakeTestCase {
* @var array
* @access public
*/
var $fixtures = array('core.article', 'core.user', 'core.comment');
var $fixtures = array('core.article', 'core.user', 'core.comment', 'core.posts_tag', 'core.tag');
/**
* startTest method
*
@@ -559,7 +587,7 @@ class ScaffoldTest extends CakeTestCase {
* @var array
* @access public
*/
var $fixtures = array('core.article', 'core.user', 'core.comment');
var $fixtures = array('core.article', 'core.user', 'core.comment', 'core.posts_tag', 'core.tag');
/**
* startTest method
*
@@ -648,6 +676,40 @@ function testScaffoldVariableSetting() {
$this->assertEqual($result['pluralVar'], 'scaffoldMock');
$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
}
/**
* test that habtm relationship keys get added to scaffoldFields.
*
* @see http://code.cakephp.org/tickets/view/48
* @return void
**/
function testHabtmFieldAdditionWithScaffoldForm() {
$this->Controller->action = 'edit';
$this->Controller->here = '/scaffold_mock';
$this->Controller->webroot = '/';
$params = array(
'plugin' => null,
'pass' => array(1),
'form' => array(),
'named' => array(),
'url' => array('url' =>'scaffold_mock'),
'controller' => 'scaffold_mock',
'action' => 'edit',
);
//set router.
Router::reload();
Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
$this->Controller->params = $params;
$this->Controller->controller = 'scaffold_mock';
$this->Controller->base = '/';
$this->Controller->constructClasses();
ob_start();
$Scaffold = new Scaffold($this->Controller, $params);
$result = ob_get_clean();
$this->assertPattern('/name="data\[ScaffoldTag\]\[ScaffoldTag\]"/', $result);
$result = $Scaffold->controller->viewVars;
$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated', 'ScaffoldTag'));
}
/**
* test that the proper names and variable values are set by Scaffold
*

0 comments on commit 2dca77c

Please sign in to comment.
You can’t perform that action at this time.