mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
Making current action be the default for new forms. Updating test accordingly. closes #5353
Signed-off-by: Mark Story <mark@mark-story.com>
This commit is contained in:
parent
55fc72c533
commit
dfc1014fba
2 changed files with 5 additions and 2 deletions
|
@ -209,7 +209,7 @@ class FormHelper extends AppHelper {
|
|||
}
|
||||
}
|
||||
if (empty($options['action'])) {
|
||||
$options['action'] = ($created) ? 'edit' : 'add';
|
||||
$options['action'] = $this->params['action'];
|
||||
}
|
||||
|
||||
$actionDefaults = array(
|
||||
|
|
|
@ -666,6 +666,7 @@ class FormHelperTest extends CakeTestCase {
|
|||
$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 @@ class FormHelperTest extends CakeTestCase {
|
|||
$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 @@ class FormHelperTest extends CakeTestCase {
|
|||
);
|
||||
$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 @@ class FormHelperTest extends CakeTestCase {
|
|||
'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();
|
||||
|
|
Loading…
Add table
Reference in a new issue