[icinga-checkins] icinga.org: icingaweb2-module-director/master: DirectorObjectForm: prefer sent over inherited

git at icinga.org git at icinga.org
Mon Jun 27 23:04:27 CEST 2016


Module: icingaweb2-module-director
Branch: master
Commit: 5e2de81767bbcef4a5ce2b1983e55ce2bf993b7d
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=5e2de81767bbcef4a5ce2b1983e55ce2bf993b7d

Author: Thomas Gelf <thomas at gelf.net>
Date:   Mon Jun 27 23:04:02 2016 +0200

DirectorObjectForm: prefer sent over inherited

---

 library/Director/Web/Form/DirectorObjectForm.php |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php
index 2c27bec..fa9864c 100644
--- a/library/Director/Web/Form/DirectorObjectForm.php
+++ b/library/Director/Web/Form/DirectorObjectForm.php
@@ -608,7 +608,7 @@ abstract class DirectorObjectForm extends QuickForm
             return;
         }
 
-        $txtInherited = $this->translate(' (inherited from "%s")');
+        $txtInherited = ' ' . $this->translate(' (inherited from "%s")');
         if ($el instanceof Zf_Select) {
             $multi = $el->getMultiOptions();
             if (is_bool($inherited)) {
@@ -950,9 +950,7 @@ abstract class DirectorObjectForm extends QuickForm
             }
         }
 
-        // Has Object:
-
-        if (!$resolved && $this->hasBeenSent()) {
+        if ($this->hasBeenSent()) {
             if (!$this->valueIsEmpty($value = $this->getSentValue($name))) {
                 return $value;
             }



More information about the icinga-checkins mailing list