From db0bdd7e891778a9026af6e55b00bae8700e6a26 Mon Sep 17 00:00:00 2001 From: Anthony F McInerney Date: Sun, 18 Oct 2020 22:06:45 +0100 Subject: [PATCH] service templates - move to blade - fix discovery function --- includes/services.inc.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/services.inc.php b/includes/services.inc.php index 3e234ecc74..7592ab836c 100644 --- a/includes/services.inc.php +++ b/includes/services.inc.php @@ -121,9 +121,7 @@ function discover_service_template($service_template = null) { $services_template = ServiceTemplate::find($service_template); $status = 1; - foreach (Service::where('service_template_id', $service_template)->where('device_group_id', '!=', $services_template['device_group_id'])->pluck('service_id') as $service) { - delete_service($service); - } + foreach (Device::inDeviceGroup($services_template['device_group_id'])->pluck('device_id') as $device) { foreach (Service::where('service_template_id', $service_template)->where('device_id', $device)->where('service_template_changed', '!=', $services_template['changed'])->pluck('service_id') as $service) { $update = ['service_desc' => $services_template['desc'], 'service_ip' => $services_template['ip'], 'service_param' => $services_template['param'], 'service_ignore' => $services_template['ignore'], 'service_disabled' => $services_template['disabled'], 'service_template_id' => $services_template['id'], 'service_name' => $services_template['name'], 'service_template_changed' => $services_template['changed']]; @@ -137,7 +135,11 @@ function discover_service_template($service_template = null) $status = 0; } } - + // remove any remaining services for this template that haven't been updated (they are no longer in the correct device group) + foreach (Service::where('service_template_id', $service_template)->where('service_template_changed', '!=', $services_template['changed'])->pluck('service_id') as $service) { + delete_service($service); + $status = 0; + } return $status; }