From 37e2a227e2ffd5746425ee6136208a9a4c3d1e90 Mon Sep 17 00:00:00 2001
From: Anthony F McInerney <afm404@gmail.com>
Date: Sat, 17 Oct 2020 15:27:14 +0100
Subject: [PATCH] service templates - move to blade - jellyfrog fixes - part2

---
 app/Models/ServiceTemplate.php | 7 -------
 includes/services.inc.php      | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/Models/ServiceTemplate.php b/app/Models/ServiceTemplate.php
index 012790b640..4bd45489a6 100644
--- a/app/Models/ServiceTemplate.php
+++ b/app/Models/ServiceTemplate.php
@@ -31,13 +31,6 @@ class ServiceTemplate extends Model implements Keyable
         return $this->id . '-' . $this->device_group_id;
     }
 
-    public static function getServiceTemplate($query)
-    {
-        return $query->where([
-            ['id', '=', $query],
-        ]);
-    }
-
     public function scopeHasAccess($query, User $user)
     {
         if ($user->hasGlobalRead()) {
diff --git a/includes/services.inc.php b/includes/services.inc.php
index 7865ba4c8d..dd8e583174 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -130,7 +130,7 @@ function discover_service_template($service_template = null)
 {
     $services_template = ServiceTemplate::find($id);
     $status = null;
-    foreach (DB::table('device_group_device')->where('device_group_id', $services_template[0]['device_group_id'])->pluck('device_id') as $device) {
+    foreach (Device::inDeviceGroup($services_template[0]['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[0]['changed'])->pluck('service_id') as $service) {
             $update = ['service_desc' => $services_template[0]['desc'], 'service_ip' => $services_template[0]['ip'], 'service_param' => $services_template[0]['param'], 'service_ignore' => $services_template[0]['ignore'], 'service_disabled' => $services_template[0]['disabled'], 'service_template_id' => $services_template[0]['id'], 'service_name' => $services_template[0]['name'], 'service_template_changed' => $services_template[0]['changed']];
             edit_service($update, $service['service_id']);