adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding a new hidden field for the disabled fields.

Browse source 
Updating the FormHelper tests for the new field.
This commit is contained in:
mark_story 2011-06-08 22:46:29 -04:00
parent 83184c99da
commit 0c3c6e5e21
2 changed files with 51 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -830,10 +830,14 @@ class FormHelperTest extends CakeTestCase {
$expected = array( $expected = array(
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array( array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][fields]', 'type' => 'hidden', 'name' => 'data[_Token][fields]',
'value' => urlencode($expected), 'id' => 'preg:/TokenFields\d+/' 'value' => urlencode($expected), 'id' => 'preg:/TokenFields\d+/'
), )),
array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][disabled]',
'value' => '', 'id' => 'preg:/TokenDisabled\d+/'
)),
'/div' '/div'
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
@ -893,10 +897,14 @@ class FormHelperTest extends CakeTestCase {
$expected = array( $expected = array(
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array( array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][fields]', 'type' => 'hidden', 'name' => 'data[_Token][fields]',
'value' => $hash, 'id' => 'preg:/TokenFields\d+/' 'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
), )),
array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][disabled]',
'value' => '', 'id' => 'preg:/TokenDisabled\d+/'
)),
'/div' '/div'
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
@ -935,10 +943,14 @@ class FormHelperTest extends CakeTestCase {
$expected = array( $expected = array(
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array( array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][fields]', 'type' => 'hidden', 'name' => 'data[_Token][fields]',
'value' => 'preg:/.+/', 'id' => 'preg:/TokenFields\d+/' 'value' => 'preg:/.+/', 'id' => 'preg:/TokenFields\d+/'
), )),
array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][disabled]',
'value' => '', 'id' => 'preg:/TokenDisabled\d+/'
)),
'/div' '/div'
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
@ -982,10 +994,14 @@ class FormHelperTest extends CakeTestCase {
$expected = array( $expected = array(
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array( array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][fields]', 'type' => 'hidden', 'name' => 'data[_Token][fields]',
'value' => $hash, 'id' => 'preg:/TokenFields\d+/' 'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
), )),
array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][disabled]',
'value' => '', 'id' => 'preg:/TokenDisabled\d+/'
)),
'/div' '/div'
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
@ -1023,14 +1039,18 @@ class FormHelperTest extends CakeTestCase {
$this->Form->input('Addresses.1.phone'); $this->Form->input('Addresses.1.phone');
$result = $this->Form->secure($this->Form->fields); $result = $this->Form->secure($this->Form->fields);
$hash = '774df31936dc850b7d8a5277dc0b890123788b09%3AAddresses.0.id%7CAddresses.1.id'; $hash = '629b6536dcece48aa41a117045628ce602ccbbb2%3AAddresses.0.id%7CAddresses.1.id';
$expected = array( $expected = array(
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array( array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][fields]', 'type' => 'hidden', 'name' => 'data[_Token][fields]',
'value' => $hash, 'id' => 'preg:/TokenFields\d+/' 'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
), )),
array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][disabled]',
'value' => 'address%7Cfirst_name', 'id' => 'preg:/TokenDisabled\d+/'
)),
'/div' '/div'
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
@ -1070,13 +1090,17 @@ class FormHelperTest extends CakeTestCase {
$result = $this->Form->secure($expected); $result = $this->Form->secure($expected);
$hash = '449b7e889128e8e52c5e81d19df68f5346571492%3AAddresses.id'; $hash = '2981c38990f3f6ba935e6561dc77277966fabd6d%3AAddresses.id';
$expected = array( $expected = array(
'div' => array('style' => 'display:none;'), 'div' => array('style' => 'display:none;'),
'input' => array( array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][fields]', 'type' => 'hidden', 'name' => 'data[_Token][fields]',
'value' => $hash, 'id' => 'preg:/TokenFields\d+/' 'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
), )),
array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][disabled]',
'value' => 'address%7Cfirst_name', 'id' => 'preg:/TokenDisabled\d+/'
)),
'/div' '/div'
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);
@ -1198,6 +1222,10 @@ class FormHelperTest extends CakeTestCase {
'type' => 'hidden', 'name' => 'data[_Token][fields]', 'type' => 'hidden', 'name' => 'data[_Token][fields]',
'value' => $hash, 'id' => 'preg:/TokenFields\d+/' 'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
)), )),
array('input' => array(
'type' => 'hidden', 'name' => 'data[_Token][disabled]',
'value' => '', 'id' => 'preg:/TokenDisabled\d+/'
)),
'/div' '/div'
); );
$this->assertTags($result, $expected); $this->assertTags($result, $expected);

10
lib/Cake/View/Helper/FormHelper.php
View file

@ -417,6 +417,7 @@ class FormHelper extends AppHelper {
return; return;
} }
$locked = array(); $locked = array();
$disabledFields = $this->_disabledFields;
foreach ($fields as $key => $value) { foreach ($fields as $key => $value) {
if (!is_int($key)) { if (!is_int($key)) {
@ -424,17 +425,24 @@ class FormHelper extends AppHelper {
unset($fields[$key]); unset($fields[$key]);
} }
} }
sort($disabledFields, SORT_STRING);
sort($fields, SORT_STRING); sort($fields, SORT_STRING);
ksort($locked, SORT_STRING); ksort($locked, SORT_STRING);
$fields += $locked; $fields += $locked;
$fields = Security::hash(serialize($fields) . Configure::read('Security.salt'));
$locked = implode(array_keys($locked), '|'); $locked = implode(array_keys($locked), '|');
$disabled = implode($disabledFields, '|');
$fields = Security::hash(serialize($fields) . $disabled . Configure::read('Security.salt'));
$out = $this->hidden('_Token.fields', array( $out = $this->hidden('_Token.fields', array(
'value' => urlencode($fields . ':' . $locked), 'value' => urlencode($fields . ':' . $locked),
'id' => 'TokenFields' . mt_rand() 'id' => 'TokenFields' . mt_rand()
)); ));
$out .= $this->hidden('_Token.disabled', array(
'value' => urlencode($disabled),
'id' => 'TokenDisabled' . mt_rand()
));
return $this->Html->useTag('block', ' style="display:none;"', $out); return $this->Html->useTag('block', ' style="display:none;"', $out);
} }