[icinga-checkins] icinga.org: icingaweb2-module-director/feature/service-sets-12891: IcingaServiceTable: Hide ServiceSet Services from applied ones listing

git at icinga.org git at icinga.org
Fri Nov 11 10:44:28 CET 2016


Module: icingaweb2-module-director
Branch: feature/service-sets-12891
Commit: c50b1b09a2c8172d55447678e2a6998135ca5c43
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=c50b1b09a2c8172d55447678e2a6998135ca5c43

Author: Markus Frosch <markus.frosch at icinga.com>
Date:   Wed Nov  9 11:05:51 2016 +0100

IcingaServiceTable: Hide ServiceSet Services from applied ones listing

refs #12891

---

 application/tables/IcingaServiceTable.php |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/tables/IcingaServiceTable.php b/application/tables/IcingaServiceTable.php
index b2c6c2b..433dc12 100644
--- a/application/tables/IcingaServiceTable.php
+++ b/application/tables/IcingaServiceTable.php
@@ -122,7 +122,8 @@ class IcingaServiceTable extends QuickTable
             'i.service_id = s.id',
             array()
         )->where('i.parent_service_id = ?', $id)
-        ->where('s.object_type = ?', 'apply');
+        ->where('s.object_type = ?', 'apply')
+        ->where('s.service_set_id IS NULL');
 
         return $db->fetchAll($query);
     }



More information about the icinga-checkins mailing list