tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DirectorObjectForm: make use of field format details

This commit is contained in:
Thomas Gelf 2015-11-14 14:47:01 +01:00
parent d943195732
commit 4853eba4da
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -189,6 +189,10 @@ abstract class DirectorObjectForm extends QuickForm
return;
}
$fields = $object->getResolvedFields();
$inherits = $object->getInheritedVars();
$origins = $object->getOriginsVars();
if ($this->hasBeenSent()) {
$vars = array();
$handled = array();
@ -199,8 +203,14 @@ abstract class DirectorObjectForm extends QuickForm
);
foreach ($values as $key => $value) {
if (substr($key, 0, 4) === 'var_') {
$vars[substr($key, 4)] = $value;
$mykey = substr($key, 4);
if (property_exists($fields, $mykey) && $fields->$mykey->format === 'json') {
$value = json_decode($value);
}
$vars[$mykey] = $value;
$handled[$key] = true;
}
@ -229,10 +239,6 @@ abstract class DirectorObjectForm extends QuickForm
$vars = $object->getVars();
$fields = $object->getResolvedFields();
$inherits = $object->getInheritedVars();
$origins = $object->getOriginsVars();
foreach ($fields as $field) {
$varname = $field->varname;