From 0d77d0ca6fd01430b5d63641b340efcf3b03f7d9 Mon Sep 17 00:00:00 2001
From: Anthony F McInerney <afm404@gmail.com>
Date: Sat, 17 Oct 2020 10:01:29 +0100
Subject: [PATCH] service templates - move to blade -wip

---
 app/Http/Controllers/ServiceTemplateController.php | 6 +++---
 app/Models/ServiceTemplate.php                     | 9 +++++++++
 includes/services.inc.php                          | 1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ServiceTemplateController.php b/app/Http/Controllers/ServiceTemplateController.php
index 764aee05cf..6ecaa9e25c 100644
--- a/app/Http/Controllers/ServiceTemplateController.php
+++ b/app/Http/Controllers/ServiceTemplateController.php
@@ -91,7 +91,7 @@ class ServiceTemplateController extends Controller
      */
     public function show(ServiceTemplate $serviceTemplate)
     {
-        return redirect(url('/services/templates/=' . $serviceTemplate->id));
+        return redirect(url('/services/template=' . $serviceTemplate->id));
     }
 
     /**
@@ -137,9 +137,9 @@ class ServiceTemplateController extends Controller
 
         $serviceTemplate->fill($request->only(['name', 'device_group_id', 'type', 'param', 'ip', 'desc', 'changed', 'ignore', 'disable']));
 
-        if ($serviceTemplate->isDirty() || $devices_updated) {
+        if ($serviceTemplate->isDirty()) {
             try {
-                if ($serviceTemplate->save() || $devices_updated) {
+                if ($serviceTemplate->save()) {
                     Toastr::success(__('Service Template :name updated', ['name' => $serviceTemplate->name]));
                 } else {
                     Toastr::error(__('Failed to save'));
diff --git a/app/Models/ServiceTemplate.php b/app/Models/ServiceTemplate.php
index 9c808c09b6..a333071b85 100644
--- a/app/Models/ServiceTemplate.php
+++ b/app/Models/ServiceTemplate.php
@@ -44,6 +44,15 @@ class ServiceTemplate extends Model implements Keyable
         ]);
     }
 
+    public function scopeHasAccess($query, User $user)
+    {
+        if ($user->hasGlobalRead()) {
+            return $query;
+        }
+
+        return $query->whereIn('id', Permissions::serviceTemplatesForUser($user));
+    }
+
     /**
      * @param Builder $query
      * @return Builder
diff --git a/includes/services.inc.php b/includes/services.inc.php
index f5b7e25e6d..019f947892 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -129,6 +129,7 @@ function delete_service_template($service_template = null)
 function discover_service_template($service_template = null)
 {
     $services_template = ServiceTemplate::getServiceTemplate($service_template);
+    $serviceTemplate->fill($request->only(['name', 'device_group_id', 'type', 'param', 'ip', 'desc', 'changed', 'ignore', 'disable']));
     $status = null;
     foreach (DB::table('device_group_device')->where('device_group_id', $services_template[0]['device_group_id'])->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]['changed'])->pluck('service_id') as $service) {