tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

DirectorObjectForm: simplify inhertance code

Browse Source
This commit is contained in:
Thomas Gelf 2016-10-20 02:11:13 +00:00
parent 09e9b7aa10
commit 00f21f838b
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,23 +236,20 @@ abstract class DirectorObjectForm extends QuickForm
$this->setDefaults($props); $this->setDefaults($props);
if (! $object instanceof IcingaObject) {
return $this;
}
if ($resolve) { if ($resolve) {
$inherited = $object->getInheritedProperties(); $this->showInheritedProperties($object);
$origins = $object->getOriginsProperties();
} else {
$inherited = (object) array();
$origins = (object) array();
} }
}
foreach ($props as $k => $v) { protected function showInheritedProperties($object)
$this->setElementValue($k, $v); {
if ($k !== 'object_name' && property_exists($inherited, $k)) { $inherited = $object->getInheritedProperties();
$origins = $object->getOriginsProperties();
foreach ($inherited as $k => $v) {
if ($v !== null && $k !== 'object_name') {
$el = $this->getElement($k); $el = $this->getElement($k);
if ($el && $resolve) { if ($el) {
$this->setInheritedValue($el, $inherited->$k, $origins->$k); $this->setInheritedValue($el, $inherited->$k, $origins->$k);
} }
} }