tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-3807-html-special-chars-conversion' into 'develop' 

Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
This commit is contained in:
Daniel Rodriguez 2019-06-25 12:19:01 +02:00
parent 569bfa2329 f3c3c3f371
commit c5be8e55ae
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -317,9 +317,9 @@ $(document).ready (function () {
jQuery.post (<?php echo "'".ui_get_full_url('ajax.php', false, false, false)."'"; ?>,
values,
function (data, status) {
original_command = js_html_entity_decode (data["command"]);
original_command = data["command"];
render_command_preview (original_command);
command_description = js_html_entity_decode (data["description"]);
command_description = data["description"];
render_command_description(command_description);
var max_fields = parseInt('<?php echo $config['max_macro_fields']; ?>');

5
pandora_console/include/javascript/pandora_alerts.js
View File

@ -1,5 +1,4 @@
var original_command = "";
function parse_alert_command(command, classs) {
if (classs == "recovery") {
classs = "fields_recovery";
@ -34,13 +33,13 @@ function parse_alert_command(command, classs) {
}
function render_command_preview(original_command) {
$("#textarea_command_preview").text(
$("#textarea_command_preview").html(
parse_alert_command(original_command, "")
);
}
function render_command_recovery_preview(original_command) {
$("#textarea_command_recovery_preview").text(
$("#textarea_command_recovery_preview").html(
parse_alert_command(original_command, "recovery")
);
}