[icinga-checkins] icinga.org: icinga-web/master: Fixed relation and filtering issues in host/ servicecomments (fixes #3273)

git at icinga.org git at icinga.org
Wed Oct 10 13:33:48 CEST 2012


Module: icinga-web
Branch: master
Commit: 7ac41e3a176596d45e3628b1556f697a6da6a9a9
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=7ac41e3a176596d45e3628b1556f697a6da6a9a9

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Oct 10 13:32:26 2012 +0200

Fixed relation and filtering issues in host/servicecomments (fixes #3273)

---

 .../LegacyLayer/TargetModifierModel.class.php      |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
old mode 100644
new mode 100755
index a7f41e9..42e2b47
--- a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
+++ b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
@@ -923,16 +923,16 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
                 $this->aliasDefs = array(
                         "i"   => array("src" => "co", "relation" => "instance"),
                         "h" => array("src" => "co", "relation" => "host","type"=>"inner", "alwaysJoin" => true),
-                        "s" => array("src" => "h", "relation" => "service","type"=>"left"),
+                        "s" => array("src" => "h", "relation" => "services","type"=>"left"),
                         "sh" => array("src" => "s", "relation" => "object"),
                         "oh" => array("src" => "h", "relation" => "object","type"=>"left"),
                         "os" => array("src" => "s", "relation" => "object","type"=>"left"),
                         "hs" => array("src" => "h", "relation" => "status"),
                         "ss" => array("src" => "s", "relation" => "status"),
-                        "cg" => array("src" => "h", "relation" => "contactgroups"),
-                        "cgm" => array("src"=> "cg", "relation" => "members"),
-                        "oc"  => array("src" => "cgm","relation" => "object"),
-                        "ocg"  => array("src" => "cg","relation" => "object")
+                        "cg" => array("src" => "h", "relation" => "contactgroups","type"=>"left"),
+                        "cgm" => array("src"=> "cg", "relation" => "members","type"=>"left"),
+                        "oc"  => array("src" => "cgm","relation" => "object","type"=>"left"),
+                        "ocg"  => array("src" => "cg","relation" => "object","type"=>"left")
                 );
                 $this->setTarget("IcingaComments");
                 break;
@@ -1242,8 +1242,8 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
             "ohg" => array("src" => "hg","relation" => "object", "type" => "left"),
 
             "hs"  => array("src" => "h", "relation" => "status"),
-            "cvss"=> array("src" => "s","relation" => "customvariablestatus"),
-            "cvsh"=> array("src" => "h", "relation" => "customvariablestatus")
+            "cvss"=> array("src" => "s","relation" => "customvariablestatus","type"=>"left"),
+            "cvsh"=> array("src" => "h", "relation" => "customvariablestatus","type"=>"left")
 
     );
 





More information about the icinga-checkins mailing list