nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1527 from laf/issue-1509

Browse Source 
Multiple alert template fixes
This commit is contained in:
Daniel Preussker
2015-07-24 10:13:29 +00:00
parent e3f9943450 4ad3b8e99d
commit 1a74941b5c
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/forms/attach-alert-template.inc.php
+1 -1
View File
@@ -36,7 +36,7 @@ else {
}
if ($success === true) {
dbDelete('alert_template_map', 'id NOT IN ('.implode(',', $ids).')');
dbDelete('alert_template_map', 'id NOT IN ('.implode(',', $ids).') AND alert_templates_id =?',array($_POST['template_id']));
echo "Alert rules have been attached to this template. $template_map_ids";
exit;
}
html/includes/modal/attach_alert_template.inc.php
+8 -2
View File
@@ -64,14 +64,20 @@ $('#attach-alert-template').on('show.bs.modal', function(e) {
data: { type: "parse-template-rules", template_id: template_id },
dataType: "json",
success: function(output) {
arr = [];
selected_items = [];
$.each( output.rule_id, function( i, elem) {
$('#rules_list option[value='+elem+']').attr("selected", true);
elem = parseInt(elem);
selected_items.push(elem);
});
$('#rules_list').val(selected_items);
}
});
});
$('#attach-alert-template').on('hide.bs.modal', function(e) {
$('#rules_list').val([]);
});
$('#alert-template-attach').click('', function(event) {
event.preventDefault();
var template_id = $("#template_id").val();
html/includes/modal/delete_alert_template.inc.php
+3 -3
View File
@@ -40,9 +40,8 @@ if(is_admin() === false) {
</div>
<script>
$('#confirm-delete-alert-template').on('show.bs.modal', function(e) {
event.preventDefault();
template_id = $(e.relatedTarget).data('template_id');
$('#confirm-delete-alert-template').on('show.bs.modal', function(event) {
template_id = $(event.relatedTarget).data('template_id');
$("#template_id").val(template_id);
});
@@ -58,6 +57,7 @@ $('#alert-template-removal').click('', function(event) {
if(msg.indexOf("ERROR:") <= -1) {
$("#row_"+template_id).remove();
}
$("#template_id").val('');
$("#message").html('<div class="alert alert-info">'+msg+'</div>');
$("#confirm-delete-alert-template").modal('hide');
},
html/includes/print-alert-templates.php
+1 -1
View File
@@ -34,7 +34,7 @@ echo '<div class="table-responsive">
<td>';
if ($_SESSION['userlevel'] >= '10') {
echo '<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#alert-template">Create new alert template</button>';
echo '<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#alert-template" data-template_id="">Create new alert template</button>';
}
echo '</td>