[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: * Fixed "open problems" problems

[git at icinga.org]

Module: icinga-web
Branch: jmosshammer/default
Commit: a8f73b6d615b167a9528fb5ec4df740345aad2a1
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=a8f73b6d615b167a9528fb5ec4df740345aad2a1

Author: jmosshammer <jannis.mosshammer at netways.com>
Date:   Wed Sep 29 17:15:01 2010 +0200

* Fixed "open problems" problems

---

 .../xml/grid/icinga-open-problems-template.xml     |    4 ++--
 .../lib/template/IcingaTemplateWorker.class.php    |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/modules/Cronks/data/xml/grid/icinga-open-problems-template.xml b/app/modules/Cronks/data/xml/grid/icinga-open-problems-template.xml
index 351f656..3f400fe 100644
--- a/app/modules/Cronks/data/xml/grid/icinga-open-problems-template.xml
+++ b/app/modules/Cronks/data/xml/grid/icinga-open-problems-template.xml
@@ -182,7 +182,7 @@
 
 		<parameter name="filterPresets">
 			<parameter name="OR">
-				<parameter name="AND">
+				<parameter name="AND_1">
 					<parameter>
 						<parameter name="field">SERVICE_CURRENT_STATE</parameter>
 						<parameter name="val">0</parameter>
@@ -194,7 +194,7 @@
 						<parameter name="op">!=</parameter>
 					</parameter>
 				</parameter>
-				<parameter name="AND">
+				<parameter name="AND_2">
 					<parameter>
 						<parameter name="field">HOST_CURRENT_STATE</parameter>
 						<parameter name="val">0</parameter>
diff --git a/app/modules/Web/lib/template/IcingaTemplateWorker.class.php b/app/modules/Web/lib/template/IcingaTemplateWorker.class.php
index 1a23c68..6b0f585 100755
--- a/app/modules/Web/lib/template/IcingaTemplateWorker.class.php
+++ b/app/modules/Web/lib/template/IcingaTemplateWorker.class.php
@@ -262,7 +262,8 @@ class IcingaTemplateWorker {
 				$searchFilter = $search->createFilter($filterElem["field"],$filterElem["val"],$filterElem["op"]);
 				$searchGroup->addFilter($searchFilter);
 			} else {
-				$newGroup =  $search->createFilterGroup($type);
+				$type= explode("_",$type);
+				$newGroup =  $search->createFilterGroup($type[0]);
 				$this->createFilter($filterElem,$newGroup,$search);
 				$searchGroup->addFilter($newGroup);
 			}
diff --git a/app/modules/Web/lib/util/IcingaApiClassUtil.class.php b/app/modules/Web/lib/util/IcingaApiClassUtil.class.php
old mode 100644
new mode 100755