diff --git a/app/Http/Controllers/Widgets/ServiceTemplateController.php b/app/Http/Controllers/Widgets/ServiceTemplateController.php index 86854a3fc6..defb330ccd 100644 --- a/app/Http/Controllers/Widgets/ServiceTemplateController.php +++ b/app/Http/Controllers/Widgets/ServiceTemplateController.php @@ -2,12 +2,10 @@ namespace App\Http\Controllers; -use App\Models\Device; use App\Models\ServiceTemplate; use Illuminate\Http\Request; use Illuminate\Validation\Rule; use LibreNMS\Alerting\QueryBuilderFilter; -use LibreNMS\Alerting\QueryBuilderFluentParser; use Toastr; class ServiceTemplateController extends Controller @@ -126,7 +124,7 @@ class ServiceTemplateController extends Controller ]); $serviceTemplate->fill($request->only(['service_template_name', 'device_group_id', 'service_template_type', 'service_template_param', 'service_template_ip', 'service_template_desc', 'service_template_changed', 'service_template_ignore', 'service_template_disable'])); - + if ($serviceTemplate->isDirty() || $devices_updated) { try { if ($serviceTemplate->save() || $devices_updated) { diff --git a/includes/services.inc.php b/includes/services.inc.php index 5424fb3050..e4f672ca44 100644 --- a/includes/services.inc.php +++ b/includes/services.inc.php @@ -169,7 +169,7 @@ function discover_service_template($device_group = null, $service_template = nul { $services_template = service_template_get($service_template); $status = null; - foreach (DB::table('device_group_device')->where('device_group_id', $device_group)-pluck('device_id') as $device) { + foreach (DB::table('device_group_device')->where('device_group_id', $device_group)->pluck('device_id') as $device) { foreach (DB::table('services')->where('service_template_id', $service_template)->where('device_id', $device)->where('service_template_changed', '!=', $services_template[0]['service_template_changed'])->pluck('service_id') as $service) { $update = ['service_desc' => $services_template[0]['service_template_desc'], 'service_ip' => $services_template[0]['service_template_ip'], 'service_param' => $services_template[0]['service_template_param'], 'service_ignore' => $services_template[0]['service_template_ignore'], 'service_disabled' => $services_template[0]['service_template_disabled'], 'service_template_id' => $services_template[0]['service_template_id'], 'service_name' => $services_template[0]['service_template_name'], 'service_template_changed' => $services_template[0]['service_template_changed']]; edit_service($update, $service['service_id']); @@ -196,7 +196,7 @@ function remove_service_template($service_template = null) return false; } $status = null; - foreach (DB::table('services')->where('service_template_id', $service_template)-pluck('service_id') as $service_id) { + foreach (DB::table('services')->where('service_template_id', $service_template)->pluck('service_id') as $service_id) { dbDelete('services', '`service_id` = ?', $service_id); $status = 1; }