TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Form widgets returns data only if it has a field definition

This commit is contained in:
Samuel Georges 2015-09-26 11:41:02 +10:00
parent cc364b3bf9
commit a636dd1ad8
1 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
modules/backend/widgets/Form.php
View File

@ -832,28 +832,35 @@ class Form extends WidgetBase
*/ */
public function getSaveData() public function getSaveData()
{ {
$data = ($this->arrayName) ? post($this->arrayName) : post(); $result = [];
/*
* Source data
*/
$data = $this->arrayName ? post($this->arrayName) : post();
if (!$data) { if (!$data) {
$data = []; $data = [];
} }
/* /*
* Number fields should be converted to integers * Spin over each field and extract the postback value
*/ */
foreach ($this->allFields as $field) { foreach ($this->allFields as $field) {
if ($field->type != 'number') {
continue;
}
/* /*
* Handle HTML array, eg: item[key][another] * Handle HTML array, eg: item[key][another]
*/ */
$parts = HtmlHelper::nameToArray($field->fieldName); $parts = HtmlHelper::nameToArray($field->fieldName);
$dotted = implode('.', $parts); $dotted = implode('.', $parts);
if (($value = array_get($data, $dotted)) !== null) { if (($value = array_get($data, $dotted)) !== null) {
/*
* Number fields should be converted to integers
*/
if ($field->type == 'number') {
$value = !strlen(trim($value)) ? null : (float) $value; $value = !strlen(trim($value)) ? null : (float) $value;
array_set($data, $dotted, $value); }
array_set($result, $dotted, $value);
} }
} }
@ -864,44 +871,11 @@ class Form extends WidgetBase
$parts = HtmlHelper::nameToArray($field); $parts = HtmlHelper::nameToArray($field);
$dotted = implode('.', $parts); $dotted = implode('.', $parts);
$widgetValue = $widget->getSaveValue(array_get($data, $dotted)); $widgetValue = $widget->getSaveValue(array_get($result, $dotted));
array_set($result, $dotted, $widgetValue);
array_set($data, $dotted, $widgetValue);
} }
/* return $result;
* Handle fields that differ by fieldName and valueFrom
* @todo @deprecated / Not needed? Remove if year >= 2016
*/
// $remappedFields = [];
// foreach ($this->allFields as $field) {
// if ($field->fieldName == $field->valueFrom) {
// continue;
// }
// /*
// * Get the value, remove it from the data collection
// */
// $parts = HtmlHelper::nameToArray($field->fieldName);
// $dotted = implode('.', $parts);
// $value = array_get($data, $dotted);
// array_forget($data, $dotted);
// /*
// * Set the new value to the data collection
// */
// $parts = HtmlHelper::nameToArray($field->valueFrom);
// $dotted = implode('.', $parts);
// array_set($remappedFields, $dotted, $value);
// }
// if (count($remappedFields) > 0) {
// $data = array_merge($remappedFields, $data);
// // Could be useful one day for field name collisions
// // $data['X_OCTOBER_REMAPPED_FIELDS'] = $remappedFields;
// }
return $data;
} }
/* /*