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

DirectorObjectForm: prefer sent over inherited

Browse Source
This commit is contained in:
Thomas Gelf 2016-06-27 23:04:02 +02:00
parent 46b4f7b047
commit 5e2de81767
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,7 +608,7 @@ abstract class DirectorObjectForm extends QuickForm
return; return;
} }
$txtInherited = $this->translate(' (inherited from "%s")'); $txtInherited = ' ' . $this->translate(' (inherited from "%s")');
if ($el instanceof Zf_Select) { if ($el instanceof Zf_Select) {
$multi = $el->getMultiOptions(); $multi = $el->getMultiOptions();
if (is_bool($inherited)) { if (is_bool($inherited)) {
@ -950,9 +950,7 @@ abstract class DirectorObjectForm extends QuickForm
} }
} }
// Has Object: if ($this->hasBeenSent()) {
if (!$resolved && $this->hasBeenSent()) {
if (!$this->valueIsEmpty($value = $this->getSentValue($name))) { if (!$this->valueIsEmpty($value = $this->getSentValue($name))) {
return $value; return $value;
} }