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: say "inherited from ..."

This commit is contained in:
Thomas Gelf 2015-08-02 15:05:47 +02:00
parent 213df7e34b
commit 1e5deb2441
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ abstract class DirectorObjectForm extends QuickForm
foreach ($props as $k => $v) {
if (property_exists($inherited, $k)) {
$this->setElementValue($k, $v, $inherited->$k, $origins->$k);
$this->setElementValue($k, $v, $inherited->$k, $origins->$k);
} else {
$this->setElementValue($k, $v);
}
@ -291,16 +291,17 @@ abstract class DirectorObjectForm extends QuickForm
return;
}
$txtInherited = $this->translate(' (inherited from "%s")');
if ($el instanceof Zf_Select) {
$multi = $el->getMultiOptions();
if (array_key_exists($inherited, $multi)) {
$multi[null] = $multi[$inherited] . sprintf(' (%s)', $inheritedFrom);
$multi[null] = $multi[$inherited] . sprintf($txtInherited, $inheritedFrom);
} else {
$multi[null] = $this->translate('- inherited -');
$multi[null] = $this->translate($this->translate('- inherited -'));
}
$el->setMultiOptions($multi);
} else {
$el->setAttrib('placeholder', $inherited . sprintf(' (%s)', $inheritedFrom));
$el->setAttrib('placeholder', $inherited . sprintf($txtInherited, $inheritedFrom));
}
}