[icinga-checkins] icinga.org: icinga-web/master: * removed with
git at icinga.org
git at icinga.org
Wed Aug 17 08:38:17 CEST 2011
Module: icinga-web
Branch: master
Commit: f044a9fb1773fb604a41903294f56bb5f27c1dc7
URL: https://git.icinga.org/?p=icinga-web.git;a=commit;h=f044a9fb1773fb604a41903294f56bb5f27c1dc7
Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date: Fri Aug 12 15:11:00 2011 +0200
* removed with
---
.../LegacyLayer/TargetModifierModel.class.php | 2 +-
.../CronkGridTemplateDisplayMonitoring.class.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
index b4868e1..8f1b3d7 100644
--- a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
+++ b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
@@ -601,7 +601,7 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
"on" => array(
"src" => "n",
"relation" => "object",
- "with"=>"on.is_active=1",
+
"alwaysJoin" => true
),
"s" => array(
diff --git a/app/modules/Cronks/lib/tdisplay/CronkGridTemplateDisplayMonitoring.class.php b/app/modules/Cronks/lib/tdisplay/CronkGridTemplateDisplayMonitoring.class.php
index 7550f4f..b8e26ea 100644
--- a/app/modules/Cronks/lib/tdisplay/CronkGridTemplateDisplayMonitoring.class.php
+++ b/app/modules/Cronks/lib/tdisplay/CronkGridTemplateDisplayMonitoring.class.php
@@ -20,7 +20,7 @@ class CronkGridTemplateDisplayMonitoring extends CronkGridTemplateDisplay {
if (($m = $ref->getMethod($type))) {
if ($m->isPublic() && $m->isStatic()) {
- return $this->getAgaviTranslationManager()->_($m->invoke(null, $val));
+ return AgaviContext::getInstance()->getTranslationManager()->_($m->invoke(null, $val));
}
}
More information about the icinga-checkins
mailing list