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

Adding fix for 'after' value not being rendered in FormHelper::input() (Ticket #2860)

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5388 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-07-07 23:30:40 +00:00
parent d8c0c67e2b
commit 8976f07acf
2 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/libs/view/helpers/form.php
View file

@ -140,7 +140,6 @@ class FormHelper extends AppHelper {
$view->modelId = $id; $view->modelId = $id;
$options = am(array( $options = am(array(
'type' => ($created && empty($options['action'])) ? 'put' : 'post', 'type' => ($created && empty($options['action'])) ? 'put' : 'post',
'id' => $model . ife($created, 'Edit', 'Add') . 'Form',
'action' => null, 'action' => null,
'url' => null, 'url' => null,
'default' => true), 'default' => true),
@ -652,9 +651,11 @@ class FormHelper extends AppHelper {
break; break;
} }
if ($type != 'hidden' && $error !== false) { if ($type != 'hidden') {
$out .= $this->error($fieldName, $error);
$out .= $after; $out .= $after;
if ($error !== false) {
$out .= $this->error($fieldName, $error);
}
} }
if (isset($divOptions)) { if (isset($divOptions)) {
$out = $this->Html->div($divOptions['class'], $out, $divOptions); $out = $this->Html->div($divOptions['class'], $out, $divOptions);
@ -1363,4 +1364,4 @@ class FormHelper extends AppHelper {
return $this->__options[$name]; return $this->__options[$name];
} }
} }
?> ?>

39
cake/tests/cases/libs/view/helpers/form.test.php
View file

@ -45,6 +45,7 @@ class ContactTestController extends Controller {
} }
class Contact extends Model { class Contact extends Model {
var $primaryKey = 'id'; var $primaryKey = 'id';
var $useTable = false; var $useTable = false;
var $name = 'Contact'; var $name = 'Contact';
@ -193,8 +194,7 @@ class FormHelperTest extends CakeTestCase {
$this->UserForm =& new UserForm(); $this->UserForm =& new UserForm();
$this->UserForm->OpenidUrl =& new OpenidUrl(); $this->UserForm->OpenidUrl =& new OpenidUrl();
$data = array('UserForm' => array('name' => 'user'), $data = array('UserForm' => array('name' => 'user'), 'OpenidUrl' => array('url' => 'http://www.cakephp.org'));
'OpenidUrl' => array('url' => 'http://www.cakephp.org'));
$result = $this->UserForm->OpenidUrl->create($data); $result = $this->UserForm->OpenidUrl->create($data);
$this->assertTrue($result); $this->assertTrue($result);
@ -301,6 +301,23 @@ class FormHelperTest extends CakeTestCase {
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
unset($this->Form->data); unset($this->Form->data);
$this->Form->validationErrors['Model']['field'] = 'Badness!';
$result = $this->Form->input('Model.field');
$expected = '<div class="input"><label for="ModelField">Field</label><input name="data[Model][field]" type="text" value="" id="ModelField" /></div>';
$this->assertPattern('/^<div[^<>]+class="input"[^<>]*><label[^<>]+for="ModelField"[^<>]*>Field<\/label><input[^<>]+class="[^"]*form-error"[^<>]+\/><div[^<>]+class="error-message">Badness!<\/div><\/div>$/', $result);
$result = $this->Form->input('Model.field', array('after' => 'A message to you, Rudy'));
$this->assertPattern('/^<div[^<>]+class="input"[^<>]*><label[^<>]+for="ModelField"[^<>]*>Field<\/label><input[^<>]+class="[^"]*form-error"[^<>]+\/>A message to you, Rudy<div[^<>]+class="error-message">Badness!<\/div><\/div>$/', $result);
$result = $this->Form->input('Model.field', array('after' => 'A message to you, Rudy', 'error' => false));
$this->assertPattern('/^<div[^<>]+class="input"[^<>]*><label[^<>]+for="ModelField"[^<>]*>Field<\/label><input[^<>]+class="[^"]*form-error"[^<>]+\/>A message to you, Rudy<\/div>$/', $result);
unset($this->Form->validationErrors['Model']['field']);
$result = $this->Form->input('Model.field', array('after' => 'A message to you, Rudy'));
$this->assertPattern('/^<div[^<>]+class="input"[^<>]*><label[^<>]+for="ModelField"[^<>]*>Field<\/label><input[^<>]+\/>A message to you, Rudy<\/div>$/', $result);
$this->assertNoPattern('/form-error/', $result);
$this->assertNoPattern('/error-message/', $result);
} }
function testLabel() { function testLabel() {
@ -644,12 +661,22 @@ class FormHelperTest extends CakeTestCase {
function testFormMagicInput() { function testFormMagicInput() {
$result = $this->Form->create('Contact'); $result = $this->Form->create('Contact');
$this->assertPattern('/^<form\s+id="ContactAddForm"\s+method="post"\s+action="\/contacts\/add\/"\s*>$/', $result); $this->assertPattern('/^<form\s+id="ContactAddForm"\s+method="post"\s+action="\/contacts\/add\/"\s*>$/', $result);
$this->assertNoPattern('/^<form[^<>]+[^id|method|action]=[^<>]*>/', $result);
/*
* This is how you write tests for tag-based output.
*/
$result = $this->Form->input('name'); $result = $this->Form->input('name');
$this->assertPattern('/^<div class="input">' . $this->assertPattern('/^<div[^<>]+><label[^<>]+>Name<\/label><input [^<>]+ \/><\/div>$/', $result);
'<label for="ContactName">Name<\/label>' . $this->assertPattern('/^<div[^<>]+class="input">/', $result);
'<input name="data\[Contact\]\[name\]" type="text" maxlength="255" value="" id="ContactName" \/>'. $this->assertPattern('/<label[^<>]+for="ContactName">/', $result);
'<\/div>$/', $result); $this->assertPattern('/<input[^<>]+name="data\[Contact\]\[name\]"[^<>]+\/>/', $result);
$this->assertPattern('/<input[^<>]+type="text"[^<>]+\/>/', $result);
$this->assertPattern('/<input[^<>]+maxlength="255"[^<>]+\/>/', $result);
$this->assertPattern('/<input[^<>]+value=""[^<>]+\/>/', $result);
$this->assertPattern('/<input[^<>]+id="ContactName"[^<>]+\/>/', $result);
$this->assertNoPattern('/<input[^<>]+[^id|maxlength|name|type|value]=[^<>]*>/', $result);
$result = $this->Form->input('Address.street'); $result = $this->Form->input('Address.street');
$this->assertPattern('/^<div class="input">' . $this->assertPattern('/^<div class="input">' .
'<label for="AddressStreet">Street<\/label>' . '<label for="AddressStreet">Street<\/label>' .