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

Fix alert rules display when creating new alert template (#12731)

Browse Source 
Doesn't clear rules from default template...
This commit is contained in:
Tony Murray
2021-04-12 02:47:08 +02:00
committed by GitHub
parent c36fe928e4
commit 0b617db7f5
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/html/modal/alert_template.inc.php
+11 -8
View File
@@ -140,18 +140,14 @@ $('#alert-template').on('hide.bs.modal', function(event) {
$('#create-template').click('', function(e) {
e.preventDefault();
var rules_items = [];
$('#rules_list :selected').each(function(i, selectedElement) {
rules_items.push($(selectedElement).val());
});
var rules_items = $('#rules_list').select2('data');
var template = $("#template").val();
var template_id = $("#template_id").val();
var name = $("#name").val();
var title = $("#title").val();
var title_rec = $("#title_rec").val();
alertTemplateAjaxOps(template, name, template_id, title, title_rec, rules_items.join(','));
alertTemplateAjaxOps(template, name, template_id, title, title_rec, rules_items);
});
//FIXME remove Deprecated template
@@ -181,10 +177,17 @@ $('#convert-template').click('', function(e) {
});
function alertTemplateAjaxOps(template, name, template_id, title, title_rec, rules) {
var rule_ajax = [];
var row_rules = [];
for (var i=0; i < rules.length; i++) {
rule_ajax.push(rules[i].id);
row_rules.push({id: rules[i].id, name: rules[i].text});
}
$.ajax({
type: "POST",
url: "ajax_form.php",
data: { type: "alert-templates", template: template, name: name, template_id: template_id, title: title, title_rec: title_rec, rules: rules},
data: { type: "alert-templates", template: template, name: name, template_id: template_id, title: title, title_rec: title_rec, rules: rule_ajax.join(',')},
dataType: "json",
success: function(output) {
if(output.status == 'ok') {
@@ -198,7 +201,7 @@ function alertTemplateAjaxOps(template, name, template_id, title, title_rec, rul
}
});
} else {
var newrow = [{id: output.newid, templatename:name}];
var newrow = [{id: output.newid, templatename: name, alert_rules: JSON.stringify(row_rules)}];
$('#templatetable').bootgrid("append", newrow);
}
} else {