Permalink
Browse files

Making current action be the default for new forms. Updating test acc…

…ordingly. closes #5353

Signed-off-by: Mark Story <mark@mark-story.com>
  • Loading branch information...
1 parent 55fc72c commit dfc1014fba452a178cfb31e9693cb2d8c28d78d3 @lorenzo lorenzo committed with markstory Oct 30, 2009
Showing with 5 additions and 2 deletions.
  1. +1 −1 cake/libs/view/helpers/form.php
  2. +4 −1 cake/tests/cases/libs/view/helpers/form.test.php
View
2 cake/libs/view/helpers/form.php
@@ -209,7 +209,7 @@ function create($model = null, $options = array()) {
}
}
if (empty($options['action'])) {
- $options['action'] = ($created) ? 'edit' : 'add';
+ $options['action'] = $this->params['action'];
}
$actionDefaults = array(
View
5 cake/tests/cases/libs/view/helpers/form.test.php
@@ -666,6 +666,7 @@ function setUp() {
$this->Form->Html =& new HtmlHelper();
$this->Controller =& new ContactTestController();
$this->View =& new View($this->Controller);
+ $this->Form->params['action'] = 'add';
ClassRegistry::addObject('view', $view);
ClassRegistry::addObject('Contact', new Contact());
@@ -4669,6 +4670,7 @@ function testFormCreate() {
$this->assertTags($result, $expected);
$this->Form->data['Contact']['id'] = 1;
+ $this->Form->params['action'] = 'edit';
$result = $this->Form->create('Contact');
$expected = array(
'form' => array(
@@ -4702,6 +4704,7 @@ function testFormCreate() {
);
$this->assertTags($result, $expected);
+ $this->Form->params['action'] = 'add';
$result = $this->Form->create('User', array('url' => array('action' => 'login')));
$expected = array(
'form' => array('id' => 'UserAddForm', 'method' => 'post', 'action' => '/users/login/'),
@@ -4841,7 +4844,7 @@ function testEditFormWithData() {
'last_name' => 'Abele',
'email' => 'nate@example.com'
));
- $this->Form->params = array('models' => array('Person'), 'controller' => 'people');
+ $this->Form->params = array('models' => array('Person'), 'controller' => 'people', 'action' => 'add');
$options = array(1 => 'Nate', 2 => 'Garrett', 3 => 'Larry');
$this->Form->create();

0 comments on commit dfc1014

Please sign in to comment.