[icinga-checkins] icinga.org: icinga-web/feature/datapermissions-wip: Remodeled TARGET_SUMMARY_COUNTS and based it on services

[git at icinga.org]

Module: icinga-web
Branch: feature/datapermissions-wip
Commit: f97f91fc44880b7f258761014c1551f068ed825a
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=f97f91fc44880b7f258761014c1551f068ed825a

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Feb 19 14:19:25 2013 +0100

Remodeled TARGET_SUMMARY_COUNTS and based it on services

---

 app/modules/Api/config/views/overview.xml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/modules/Api/config/views/overview.xml b/app/modules/Api/config/views/overview.xml
index 286437b..70f2b66 100644
--- a/app/modules/Api/config/views/overview.xml
+++ b/app/modules/Api/config/views/overview.xml
@@ -175,23 +175,21 @@
                                     THEN ss.service_object_id
                                     ELSE NULL END
                 ) AS service_checks_disabled
-            FROM IcingaObjects o
-            LEFT JOIN o.host h
-            LEFT JOIN o.service s
-            LEFT JOIN h.status hs
-            LEFT JOIN s.status ss
-            WHERE o.is_active = true
+            FROM IcingaServices s
+            INNER JOIN s.host h
+            INNER JOIN h.status hs
+            INNER JOIN s.status ss
             ]]>
             </query>
 
             <credential name="IcingaHost" type="MultiLike">
                 <parameter name="target">IcingaHost</parameter>
-                <parameter name="column">o.name1</parameter>
+                <parameter name="column">h.display_name</parameter>
             </credential>
 
             <credential name="IcingaService" type="MultiLike">
                 <parameter name="target">IcingaService</parameter>
-                <parameter name="column">o.name2</parameter>
+                <parameter name="column">s.display_name</parameter>
                 <parameter name="ornull">true</parameter>
             </credential>