[icinga-checkins] icinga.org: icinga-web/master: Fixed comments not being shown when filters are set

git at icinga.org git at icinga.org
Tue Oct 9 16:10:08 CEST 2012


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Oct  9 16:09:15 2012 +0200

Fixed comments not being shown when filters are set
(fixes #3190, fixes #3221)

---

 app/modules/Api/config/views/hostgroups.xml        |    2 +-
 .../Cronk/grid/renderer/CommentColumnRenderer.js   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/modules/Api/config/views/hostgroups.xml b/app/modules/Api/config/views/hostgroups.xml
index 40d08ad..f466622 100755
--- a/app/modules/Api/config/views/hostgroups.xml
+++ b/app/modules/Api/config/views/hostgroups.xml
@@ -35,7 +35,7 @@
            </query>
            
            <credential name="UserObjectId" type="UserObjectId">
-                <parameter name="target_fields">h.host_object_id, s.service_object_id</parameter>
+                <parameter name="target_fields">h.host_object_id</parameter>
                 <parameter name="aggregation">or</parameter>
             </credential>
         </dql>
diff --git a/app/modules/Cronks/lib/js/Cronk/grid/renderer/CommentColumnRenderer.js b/app/modules/Cronks/lib/js/Cronk/grid/renderer/CommentColumnRenderer.js
old mode 100644
new mode 100755
index a5a4a0b..1c00e9e
--- a/app/modules/Cronks/lib/js/Cronk/grid/renderer/CommentColumnRenderer.js
+++ b/app/modules/Cronks/lib/js/Cronk/grid/renderer/CommentColumnRenderer.js
@@ -96,7 +96,7 @@ Ext.ns('Cronk.grid');
                     },
                     url: AppKit.c.path + "/web/api/json",
                     params: {
-                        target: 'comment',
+                        target: field.split("_")[0]+'comment',
 
                         filters_json: Ext.encode(buildIdFilter(field, ids)),
                         "columns[0]": field,





More information about the icinga-checkins mailing list