Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
* Changed target to common comments (fixes #2225)
Browse files Browse the repository at this point in the history 
* Filter for info icons is now object_id
  • Loading branch information
@mxhash
mxhash committed Feb 7, 2012
1 parent 750b469 commit e60b15e
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions app/modules/Api/models/Store/LegacyLayer/TargetModifierModel.class.php
View file
Expand Up @@ -888,11 +888,11 @@ protected function setupApiTargetFor($target) {
"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"),
Expand Down
4 changes: 2 additions & 2 deletions app/modules/Cronks/data/xml/grid/icinga-host-template.xml
View file
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions app/modules/Cronks/data/xml/grid/icinga-open-problems-template.xml
View file
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions app/modules/Cronks/data/xml/grid/icinga-service-template.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/modules/Cronks/data/xml/grid/icinga-unhandled-host-problems.xml
View file
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions app/modules/Cronks/data/xml/grid/icinga-unhandled-service-problems.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/modules/Cronks/lib/js/grid/renderer/CommentColumnRenderer.js
View file
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/modules/Web/config/simple_data_provider.xml
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit e60b15e

Please sign in to comment.