service templates - move to blade - fix discovery function

This commit is contained in:
Anthony F McInerney
2020-10-18 22:06:45 +01:00
parent a741361388
commit db0bdd7e89
+6 -4
View File
@@ -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;
}