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

Implementing template for input formats, test pending

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-02-26 18:39:33 -04:30
parent 9a4de854d6
commit 056b87d13a
1 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -585,7 +585,7 @@ class FormHelper extends AppHelper {
*/ */
function inputs($fields = null, $blacklist = null) { function inputs($fields = null, $blacklist = null) {
$fieldset = $legend = true; $fieldset = $legend = true;
$model = $this->model();
if (is_array($fields)) { if (is_array($fields)) {
if (array_key_exists('legend', $fields)) { if (array_key_exists('legend', $fields)) {
$legend = $fields['legend']; $legend = $fields['legend'];
@ -605,7 +605,7 @@ class FormHelper extends AppHelper {
} }
if (empty($fields)) { if (empty($fields)) {
$fields = array_keys($this->fieldset[$this->model()]['fields']); $fields = array_keys($this->fieldset[$model]['fields']);
} }
if ($legend === true) { if ($legend === true) {
@ -617,7 +617,7 @@ class FormHelper extends AppHelper {
if ($isEdit) { if ($isEdit) {
$actionName = __('Edit %s', true); $actionName = __('Edit %s', true);
} }
$modelName = Inflector::humanize(Inflector::underscore($this->model())); $modelName = Inflector::humanize(Inflector::underscore($model));
$legend = sprintf($actionName, __($modelName, true)); $legend = sprintf($actionName, __($modelName, true));
} }
@ -675,6 +675,10 @@ class FormHelper extends AppHelper {
* - `before` - Content to place before the label + input. * - `before` - Content to place before the label + input.
* - `after` - Content to place after the label + input. * - `after` - Content to place after the label + input.
* - `between` - Content to place between the label + input. * - `between` - Content to place between the label + input.
* - `format` - format template for element order. Any element that is not in the array, will not be in the output.
* Default input format order: array('before', 'label', 'between', 'input', 'after', 'error')
* Default checkbox format order: array('before', 'input', 'between', 'label', 'after', 'error')
* Hidden input will not be formatted
* *
* @param string $fieldName This should be "Modelname.fieldname" * @param string $fieldName This should be "Modelname.fieldname"
* @param array $options Each type of input takes different options. * @param array $options Each type of input takes different options.
@ -685,7 +689,7 @@ class FormHelper extends AppHelper {
$this->setEntity($fieldName); $this->setEntity($fieldName);
$options = array_merge( $options = array_merge(
array('before' => null, 'between' => null, 'after' => null), array('before' => null, 'between' => null, 'after' => null, 'format' => null),
$this->_inputDefaults, $this->_inputDefaults,
$options $options
); );
@ -758,7 +762,6 @@ class FormHelper extends AppHelper {
$options['maxlength'] = array_sum(explode(',', $fieldDef['length']))+1; $options['maxlength'] = array_sum(explode(',', $fieldDef['length']))+1;
} }
$out = '';
$div = true; $div = true;
$divOptions = array(); $divOptions = array();
@ -830,7 +833,7 @@ class FormHelper extends AppHelper {
if (isset($options['id'])) { if (isset($options['id'])) {
$labelAttributes = array_merge($labelAttributes, array('for' => $options['id'])); $labelAttributes = array_merge($labelAttributes, array('for' => $options['id']));
} }
$out = $this->label($fieldName, $labelText, $labelAttributes); $label = $this->label($fieldName, $labelText, $labelAttributes);
} }
$error = null; $error = null;
@ -865,76 +868,77 @@ class FormHelper extends AppHelper {
} }
$type = $options['type']; $type = $options['type'];
$before = $options['before']; $out = array_merge(
$between = $options['between']; array('before' => null, 'label' => null, 'between' => null, 'input' => null, 'after' => null, 'error' => null),
$after = $options['after']; array('before' => $options['before'], 'label' => $label, 'between' => $options['between'], 'after' => $options['after'])
unset($options['type'], $options['before'], $options['between'], $options['after']); );
$format = null;
if (is_array($options['format']) && in_array('input', $options['format'])) {
$format = $options['format'];
}
unset($options['type'], $options['before'], $options['between'], $options['after'], $options['format']);
switch ($type) { switch ($type) {
case 'hidden': case 'hidden':
$out = $this->hidden($fieldName, $options); $input = $this->hidden($fieldName, $options);
$format = array('input');
unset($divOptions); unset($divOptions);
break; break;
case 'checkbox': case 'checkbox':
$out = $before . $this->checkbox($fieldName, $options) . $between . $out; $input = $this->checkbox($fieldName, $options);
$format = $format ?: array('before', 'input', 'between', 'label', 'after', 'error');
break; break;
case 'radio': case 'radio':
$out = $before . $out . $this->radio($fieldName, $radioOptions, $options) . $between; $input = $this->radio($fieldName, $radioOptions, $options);
break; break;
case 'text': case 'text':
case 'password': case 'password':
$out = $before . $out . $between . $this->{$type}($fieldName, $options);
break;
case 'file': case 'file':
$out = $before . $out . $between . $this->file($fieldName, $options); $input = $this->{$type}($fieldName, $options);
break; break;
case 'select': case 'select':
$options = array_merge(array('options' => array()), $options); $options += array('options' => array());
$list = $options['options']; $list = $options['options'];
unset($options['options']); unset($options['options']);
$out = $before . $out . $between . $this->select( $input = $this->select($fieldName, $list, $selected, $options);
$fieldName, $list, $selected, $options
);
break; break;
case 'time': case 'time':
$out = $before . $out . $between . $this->dateTime( $input = $this->dateTime($fieldName, null, $timeFormat, $selected, $options);
$fieldName, null, $timeFormat, $selected, $options
);
break; break;
case 'date': case 'date':
$out = $before . $out . $between . $this->dateTime( $input = $this->dateTime($fieldName, $dateFormat, null, $selected, $options);
$fieldName, $dateFormat, null, $selected, $options
);
break; break;
case 'datetime': case 'datetime':
$out = $before . $out . $between . $this->dateTime( $input = $this->dateTime($fieldName, $dateFormat, $timeFormat, $selected, $options);
$fieldName, $dateFormat, $timeFormat, $selected, $options
);
break; break;
case 'textarea': case 'textarea':
default: default:
$out = $before . $out . $between . $this->textarea($fieldName, array_merge( $input = $this->textarea($fieldName, $options + array('cols' => '30', 'rows' => '6'));
array('cols' => '30', 'rows' => '6'), $options
));
break; break;
} }
if ($type != 'hidden') { if ($type != 'hidden' && $error !== false) {
$out .= $after; $errMsg = $this->error($fieldName, $error);
if ($error !== false) { if ($errMsg) {
$errMsg = $this->error($fieldName, $error); $divOptions = $this->addClass($divOptions, 'error');
if ($errMsg) { $out['error'] = $errMsg;
$out .= $errMsg;
$divOptions = $this->addClass($divOptions, 'error');
}
} }
} }
if (isset($divOptions) && isset($divOptions['tag'])) {
$out['input'] = $input;
$format = $format ?: array('before', 'label', 'between', 'input', 'after', 'error');
$output = '';
foreach ($format as $element) {
$output .= $out[$element];
unset($out[$element]);
}
if (!empty($divOptions['tag'])) {
$tag = $divOptions['tag']; $tag = $divOptions['tag'];
unset($divOptions['tag']); unset($divOptions['tag']);
$out = $this->Html->tag($tag, $out, $divOptions); $output = $this->Html->tag($tag, $output, $divOptions);
} }
return $out; return $output;
} }
/** /**