#564 Fix filter for service by servicegroup

centreon · Sep 17, 2015 · 228ab06 · 228ab06
1 parent 757490b
commit 228ab06
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceGridBySGXML.php b/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceGridBySGXML.php
@@ -117,9 +117,10 @@
     if ($hSearch != ""){
         $query .= "AND h.name like '%" . $hSearch . "%' ";
     }
-
+
+    /* Servicegroup search */    
     if ($sgSearch != ""){
-        $query .= "AND sg.name like '%" . $sgSearch . "%' ";
+        $query .= "AND sg.name like '" . $sgSearch . "' ";
     }
 
     /* Service search */
@@ -155,6 +156,9 @@
         }
         $sg_search .= implode(" OR ", $servicegroupsSql1);
         $sg_search .= ") ";
+        if ($sgSearch != ""){
+            $sg_search .= "AND sg.name like '" . $sgSearch . "' ";
+        }
     }
 
     /** ***************************************************

diff --git a/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceSummaryBySGXML.php b/www/include/monitoring/status/ServicesServiceGroups/xml/broker/serviceSummaryBySGXML.php
@@ -118,8 +118,9 @@
         $query .= "AND h.name like '%" . $hSearch . "%' ";
     }
 
+    /* Servicegroup search */
     if ($sgSearch != ""){
-        $query .= "OR sg.name like '%" . $sgSearch . "%' ";
+        $query .= "AND sg.name like '" . $sgSearch . "' ";
     }
 
     /* Service search */
@@ -156,6 +157,9 @@
         }
         $sg_search .= implode(" OR ", $servicegroupsSql1);
         $sg_search .= ") ";
+        if ($sgSearch != ""){
+            $sg_search .= "AND sg.name like '" . $sgSearch . "' ";
+        }
     }
 
     /** ***************************************************