diff --git a/includes/html/forms/delete-service-template.inc.php b/includes/html/forms/delete-service-template.inc.php index 5baa29a7c2..b6179fbca4 100644 --- a/includes/html/forms/delete-service-template.inc.php +++ b/includes/html/forms/delete-service-template.inc.php @@ -17,7 +17,7 @@ if (! Auth::user()->hasGlobalAdmin()) { if (! is_numeric($vars['service_template_id'])) { $status = ['status' =>1, 'message' => 'No Service Template has been selected']; } else { - if (delete_service_template($vars['service_template_id'], $vars['service_delete'])) { + if (delete_service_template($vars['service_template_id'])) { $status = ['status' =>0, 'message' => 'Service Template: ' . $vars['service_template_id'] . ', has been deleted.']; } else { $status = ['status' =>1, 'message' => 'Service Template: ' . $vars['service_template_id'] . ', has NOT been deleted.']; diff --git a/includes/html/modal/delete_service_template.inc.php b/includes/html/modal/delete_service_template.inc.php index 5c790f66bd..2929fd717d 100644 --- a/includes/html/modal/delete_service_template.inc.php +++ b/includes/html/modal/delete_service_template.inc.php @@ -24,21 +24,9 @@ if (Auth::user()->hasGlobalAdmin()) {
Service Template will be deleted.
+
All Services created by this Template will also be deleted!.

@@ -46,7 +34,6 @@ if (Auth::user()->hasGlobalAdmin()) { data-target="service-template-removal">Delete -
@@ -68,11 +55,10 @@ if (Auth::user()->hasGlobalAdmin()) { $('#service-template-removal').click('', function (e) { e.preventDefault(); var service_template_id = $("#service_template_id").val(); - var service_delete = $("#service_delete").val(); $.ajax({ type: 'POST', url: 'ajax_form.php', - data: {type: "delete-service-template", service_template_id: service_template_id, service_delete: service_delete}, + data: {type: "delete-service-template", service_template_id: service_template_id}, success: function (result) { if (result.status == 0) { // Yay. diff --git a/includes/html/pages/services-templates.inc.php b/includes/html/pages/services-templates.inc.php index 29c200e64f..6ff2edec2b 100644 --- a/includes/html/pages/services-templates.inc.php +++ b/includes/html/pages/services-templates.inc.php @@ -121,7 +121,7 @@ require_once 'includes/html/modal/remove_service_template.inc.php'; echo 'Parameters'; echo 'Remote Host'; echo 'Description'; - echo 'Last Changed'; + echo 'Modified'; echo 'Ignored'; echo 'Disabled'; echo ''; diff --git a/includes/services.inc.php b/includes/services.inc.php index 55c4c0cd66..7aab83867a 100644 --- a/includes/services.inc.php +++ b/includes/services.inc.php @@ -175,15 +175,13 @@ function edit_service_template($update = [], $service_template = null) return dbUpdate($update, 'services_template', '`service_template_id`=?', [$service_template]); } -function delete_service_template($service_template = null, $service_delete = null) +function delete_service_template($service_template = null) { if (! is_numeric($service_template)) { return false; } - if ($service_delete == 1) { - foreach (dbFetchRows('SELECT * FROM `services` WHERE `service_template_id` = ?', [$service_template]) as $service) { - dbDelete('services', '`service_id` = ?', [$service['service_id']]); - } + foreach (dbFetchRows('SELECT * FROM `services` WHERE `service_template_id` = ?', [$service_template]) as $service) { + dbDelete('services', '`service_id` = ?', [$service['service_id']]); } return dbDelete('services_template', '`service_template_id` = ?', [$service_template]);