diff --git a/modules/netranges.php b/modules/netranges.php index 83ac463e56..0c678a44de 100644 --- a/modules/netranges.php +++ b/modules/netranges.php @@ -438,10 +438,13 @@ function getBuildings(array $filter) ) : '') ); } + $majortechs = isset($filter['majortechs']) && is_array($filter['majortechs']) ? + Utils::filterIntegers(array_values($filter['majortechs'])) : array(); + if (empty($buildings)) { $buildings = array(); } else { - foreach ($buildings as &$building) { + foreach ($buildings as $key => &$building) { $city_id = intval($building['city_id']); $street_id = intval($building['street_id']); $street_ident = intval($building['street_ident']); @@ -457,6 +460,12 @@ function getBuildings(array $filter) $building['customers'] = array(); $building['existing'] = 0; } + if (!empty($majortechs) + && isset($nodes[$city_id][$street_ident][$building_num]) + && !array_intersect($majortechs, + array_keys($nodes[$city_id][$street_ident][$building_num]['linktechnologies']))) { + unset($buildings[$key]); + } } unset($building); if (!empty($existing)) { @@ -828,6 +837,7 @@ function getBuildings(array $filter) $SMARTY->assign(array( 'filter' => $filter, 'linktechnologies' => $SIDUSIS_LINKTECHNOLOGIES, + 'linktechnologiesall' => $LINKTECHNOLOGIES, 'linkspeeds' => $linkspeeds, 'range'=> $range, 'unique_total' => $unique_total, diff --git a/templates/default/net/netranges.html b/templates/default/net/netranges.html index 4aeed66069..9d7ab19179 100644 --- a/templates/default/net/netranges.html +++ b/templates/default/net/netranges.html @@ -282,6 +282,19 @@

{$layout.pagetitle}

+ {trans("Services")}