Service groups: Apply base filter to badge links

application/controllers/ServicegroupsController.php

@@ -28,6 +28,8 @@ class ServicegroupsController extends Controller
         $this->addControl($limitControl);
         $this->addControl($filterControl);
 
-        $this->addContent(new ServicegroupList($servicegroups));
+        $this->addContent(
+            (new ServicegroupList($servicegroups))->setBaseFilter($this->getFilter())
+        );
     }
 }

library/Icingadb/Widget/ItemList/ServicegroupListItem.php

@@ -29,7 +29,11 @@ class ServicegroupListItem extends BaseTableRowItem
 
         if ($this->item->services_total > 0) {
             $badges = new ServiceStateBadges($this->item);
-            $badges->getUrl()->getParams()->mergeValues(['servicegroup.name' => $this->item->name]);
+            $badges
+                ->setBaseFilter($this->list->getBaseFilter())
+                ->getUrl()
+                    ->getParams()
+                    ->mergeValues(['servicegroup.name' => $this->item->name]);
 
             $columns->add([
                 $this->createColumn(HtmlString::create($servicesChart->render())),