[icinga-checkins] icinga.org: icinga-web/master: * Changed target to common comments ( fixes #2225)

git at icinga.org git at icinga.org
Tue Feb 7 16:14:53 CET 2012


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Feb  7 16:14:23 2012 +0100

* Changed target to common comments (fixes #2225)
* Filter for info icons is now object_id

---

 .../LegacyLayer/TargetModifierModel.class.php      |    4 ++--
 .../Cronks/data/xml/grid/icinga-host-template.xml  |    4 ++--
 .../xml/grid/icinga-open-problems-template.xml     |    4 ++--
 .../data/xml/grid/icinga-service-template.xml      |    4 ++--
 .../xml/grid/icinga-unhandled-host-problems.xml    |    2 +-
 .../xml/grid/icinga-unhandled-service-problems.xml |    4 ++--
 .../lib/js/grid/renderer/CommentColumnRenderer.js  |    2 +-
 app/modules/Web/config/simple_data_provider.xml    |    6 +++---
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
index 8ebc622..9999d7e 100644
--- a/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
+++ b/app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
@@ -888,11 +888,11 @@ class Api_Store_LegacyLayer_TargetModifierModel extends IcingaStoreTargetModifie
                         "i"   => array("src" => "co", "relation" => "instance"),
                         "s" => array("src" => "co", "relation" => "service","type"=>"left"),
                         "h" => array("src" => "co", "relation" => "host","type"=>"left"),
-                        "sh" => array("src" => "s", "relation" => "object"),
+                        "sh" => array("src" => "s", "relation" => "object", "type"=>"left"),
                         "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"),
+                        "ss" => array("src" => "s", "relation" => "status", "type"=>"left"),
                         "cg" => array("src" => "h", "relation" => "contactgroups"),
                         "cgm" => array("src"=> "cg", "relation" => "members"),
                         "oc"  => array("src" => "cgm","relation" => "object"),
diff --git a/app/modules/Cronks/data/xml/grid/icinga-host-template.xml b/app/modules/Cronks/data/xml/grid/icinga-host-template.xml
index 892f22a..d6cd0e1 100644
--- a/app/modules/Cronks/data/xml/grid/icinga-host-template.xml
+++ b/app/modules/Cronks/data/xml/grid/icinga-host-template.xml
@@ -830,8 +830,8 @@
 	                	<parameter name="arguments">
 	                		<parameter name="title">Detailed hostinfo</parameter>
 	                		<parameter name="src_id">hostinfo</parameter> 
-							<parameter name="filter">
-	                			<parameter name="host">host_name</parameter>
+					<parameter name="filter">
+	                			<parameter name="host">host_object_id</parameter>
 	                		</parameter>
 	                	</parameter>
 	                </parameter>
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 2f9cb7d..4c1a297 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
@@ -398,8 +398,8 @@
 	                		<parameter name="title">Detailed serviceinfo</parameter>
 	                		<parameter name="src_id">serviceinfo</parameter>
 	                		<parameter name="filter">
-	                			<parameter name="host">host_name</parameter>
-	                			<parameter name="service">service_name</parameter>
+	                			<parameter name="host">host_object_id</parameter>
+	                			<parameter name="service">service_object_id</parameter>
 	                		</parameter>
 	                	</parameter>
 	                </parameter>
diff --git a/app/modules/Cronks/data/xml/grid/icinga-service-template.xml b/app/modules/Cronks/data/xml/grid/icinga-service-template.xml
index 6326943..bb407fb 100644
--- a/app/modules/Cronks/data/xml/grid/icinga-service-template.xml
+++ b/app/modules/Cronks/data/xml/grid/icinga-service-template.xml
@@ -693,8 +693,8 @@
 	                		<parameter name="title">Detailed serviceinfo</parameter>
 	                		<parameter name="src_id">serviceinfo</parameter>
 	                		<parameter name="filter">
-	                			<parameter name="host">host_name</parameter>
-	                			<parameter name="service">service_name</parameter>
+	                			<parameter name="host">host_object_id</parameter>
+	                			<parameter name="service">service_object_id</parameter>
 	                		</parameter>
 	                	</parameter>
 	                </parameter>
diff --git a/app/modules/Cronks/data/xml/grid/icinga-unhandled-host-problems.xml b/app/modules/Cronks/data/xml/grid/icinga-unhandled-host-problems.xml
index a7a4bae..bea4bac 100644
--- a/app/modules/Cronks/data/xml/grid/icinga-unhandled-host-problems.xml
+++ b/app/modules/Cronks/data/xml/grid/icinga-unhandled-host-problems.xml
@@ -839,7 +839,7 @@
 	                		<parameter name="title">Detailed hostinfo</parameter>
 	                		<parameter name="src_id">hostinfo</parameter> 
 							<parameter name="filter">
-	                			<parameter name="host">host_name</parameter>
+	                			<parameter name="host">host_object_id</parameter>
 	                		</parameter>
 	                	</parameter>
 	                </parameter>
diff --git a/app/modules/Cronks/data/xml/grid/icinga-unhandled-service-problems.xml b/app/modules/Cronks/data/xml/grid/icinga-unhandled-service-problems.xml
index 4031baa..2c03ced 100644
--- a/app/modules/Cronks/data/xml/grid/icinga-unhandled-service-problems.xml
+++ b/app/modules/Cronks/data/xml/grid/icinga-unhandled-service-problems.xml
@@ -716,8 +716,8 @@
 	                		<parameter name="title">Detailed serviceinfo</parameter>
 	                		<parameter name="src_id">serviceinfo</parameter>
 	                		<parameter name="filter">
-	                			<parameter name="host">host_name</parameter>
-	                			<parameter name="service">service_name</parameter>
+	                			<parameter name="host">host_object_id</parameter>
+	                			<parameter name="service">service_object_id</parameter>
 	                		</parameter>
 	                	</parameter>
 	                </parameter>
diff --git a/app/modules/Cronks/lib/js/grid/renderer/CommentColumnRenderer.js b/app/modules/Cronks/lib/js/grid/renderer/CommentColumnRenderer.js
index cf9d03e..8747e08 100644
--- a/app/modules/Cronks/lib/js/grid/renderer/CommentColumnRenderer.js
+++ b/app/modules/Cronks/lib/js/grid/renderer/CommentColumnRenderer.js
@@ -59,7 +59,7 @@ Cronk.grid.CommentColumnRenderer = new (function () {
         Ext.Ajax.request({
             url: AppKit.c.path+"/web/api/json",
             params: {
-                target: 'servicecomment',
+                target: 'comment',
                 
                 filters_json: Ext.encode(buildIdFilter(field,ids)),
                 "columns[0]": field
diff --git a/app/modules/Web/config/simple_data_provider.xml b/app/modules/Web/config/simple_data_provider.xml
index f291794..f05700f 100644
--- a/app/modules/Web/config/simple_data_provider.xml
+++ b/app/modules/Web/config/simple_data_provider.xml
@@ -289,7 +289,7 @@
 			</ae:parameter>
 			<ae:parameter name="user_filters">
 				<ae:parameter name="host">
-					<ae:parameter name="column">HOST_NAME</ae:parameter>
+					<ae:parameter name="column">HOST_OBJECT_ID</ae:parameter>
 					<ae:parameter name="match_type">IcingaApiConstants::MATCH_EXACT</ae:parameter>
 				</ae:parameter>
 			</ae:parameter>
@@ -406,11 +406,11 @@
 			</ae:parameter>
 			<ae:parameter name="user_filters">
 				<ae:parameter name="host">
-					<ae:parameter name="column">HOST_NAME</ae:parameter>
+					<ae:parameter name="column">HOST_OBJECT_ID</ae:parameter>
 					<ae:parameter name="match_type">IcingaApiConstants::MATCH_EXACT</ae:parameter>
 				</ae:parameter>
 				<ae:parameter name="service">
-					<ae:parameter name="column">SERVICE_NAME</ae:parameter>
+					<ae:parameter name="column">SERVICE_OBJECT_ID</ae:parameter>
 					<ae:parameter name="match_type">IcingaApiConstants::MATCH_EXACT</ae:parameter>
 				</ae:parameter>
 			</ae:parameter>





More information about the icinga-checkins mailing list