From 0b617db7f52f6e021d3a054beb7c2b5fc9709a1e Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Sun, 11 Apr 2021 19:47:08 -0500
Subject: [PATCH] Fix alert rules display when creating new alert template
 (#12731)

Doesn't clear rules from default template...
---
 includes/html/modal/alert_template.inc.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/includes/html/modal/alert_template.inc.php b/includes/html/modal/alert_template.inc.php
index 73b7886339..c6b3b7bc7f 100644
--- a/includes/html/modal/alert_template.inc.php
+++ b/includes/html/modal/alert_template.inc.php
@@ -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 {