mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add service templates - update delete function

Browse Source
This commit is contained in:
Anthony F McInerney
2020-09-28 01:34:23 +01:00
parent 36d2d0a887
commit a54ea4a94b
4 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/html/forms/delete-service-template.inc.php
+1 -1
View File
@@ -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: <i>' . $vars['service_template_id'] . ', has been deleted.</i>'];
} else {
$status = ['status' =>1, 'message' => 'Service Template: <i>' . $vars['service_template_id'] . ', has NOT been deleted.</i>'];
includes/html/modal/delete_service_template.inc.php
+3 -17
View File
@@ -24,21 +24,9 @@ if (Auth::user()->hasGlobalAdmin()) {
<div class='alert alert-info'>Service Template will be deleted.</div>
<div class='well well-lg'>
<div class="modal-body">
<p>Please confirm that you would like to delete:</p>
<?php echo $vars['service_template_name']; ?>
<?php echo mres($vars['service_template_name']); ?>
<div class="form-group row">
<div class="col-sm-12 alert alert-info">
<label class='control-label text-left input-sm'>Please Tick this box to remove Services from Devices, that have been created with this Template.</label>
</div>
</div>
<div class="form-group">
<label for="service_delete" class="col-sm-3 col-md-3 control-label" title="Delete Services">Delete Services:</label>
<div class="col-sm-9 col-md-9">
<input type='checkbox' name='service_delete' id='service_delete'>
</div>
</div>
<p>Please confirm that you would like to delete:<?php echo $vars['service_template_name']; ?></p>
</div>
<div class='alert alert-info'>All Services created by this Template will also be deleted!.</div>
<hr>
<form role="form" class="remove_token_form">
<?php echo csrf_field() ?>
@@ -46,7 +34,6 @@ if (Auth::user()->hasGlobalAdmin()) {
data-target="service-template-removal">Delete
</button></center>
<input type="hidden" name="service_template_id" id="service_template_id" value="">
<input type="hidden" name="service_delete" id="service_delete" value="">
<input type="hidden" name="confirm" id="confirm" value="yes">
</form>
</div>
@@ -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.
includes/html/pages/services-templates.inc.php
+1 -1
View File
@@ -121,7 +121,7 @@ require_once 'includes/html/modal/remove_service_template.inc.php';
echo '<th style="width:10%;max-width: 15%;">Parameters</th>';
echo '<th style="width:10%;max-width: 15%;">Remote Host</th>';
echo '<th style="width:10%;max-width: 15%;">Description</th>';
echo '<th style="width:10%;max-width: 10%;">Last Changed</th>';
echo '<th style="width:10%;max-width: 10%;">Modified</th>';
echo '<th style="width:5%;max-width: 5%;">Ignored</th>';
echo '<th style="width:5%;max-width: 5%;">Disabled</th>';
echo '<th style="width:10%;max-width:10%;"></th>';
includes/services.inc.php
+3 -5
View File
@@ -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]);