[icinga-checkins] icinga.org: icinga-web/master: * Fixed some contactgroup principal issues

git at icinga.org git at icinga.org
Tue Feb 21 13:51:56 CET 2012


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Feb 21 13:51:43 2012 +0100

* Fixed some contactgroup principal issues

---

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

diff --git a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
index 949febb..6b7fbee 100644
--- a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
+++ b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
@@ -407,6 +407,8 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
                 $this->mainAlias = "i";
                 $this->setTarget("IcingaInstances");
                 $this->aliasDefs = array(
+                        "h" => array("src"=>"i", "relation" => "hosts"),
+                        "s" => array("src"=>"i", "relation" => "services"),
                         "cg" => array("src" => "i", "relation"=>"contactgroups"),
                         "cgm" => array("src" => "i", "relation"=>"contacts"),
                         "oc"  => array("src" => "cgm","relation" => "object"),
@@ -1077,6 +1079,10 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
                         "h" => array("src" => "dt", "relation" => "host"),
                         "sh" => array("src" => "dt","relation" => "object"),
                         "oh" => array("src" => "dt","relation" => "object"),
+                        "cg" => array("src" => "h", "relation" => "contactgroups"),
+                        "cgm" => array("src" => "cg", "relation" => "members"),
+                        "oc" => array("src"=>"cg","relation" => "object"),
+                        "ocm" => array("src"=>"cgm","relation" => "object"),
                         "sg" => array("src" => "s","relation" => "servicegroups"),
                         "sgm" => array("src" => "sg", "relation" => "members"),
                         "osg" => array("src" => "sg", "relation" => "object"),





More information about the icinga-checkins mailing list