From 96d7aca5bf80d9f8a1da7519d5a4aea3d1c8b2b0 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Thu, 21 Jul 2016 14:48:56 +0200 Subject: [PATCH] Fixed problems qith html editor in textareas in visual console (cherry picked from commit 06e37132a8cd8b2329a6dcc5a82522869e7f21fb) --- .../reporting/visual_console_builder.editor.js | 14 +++++++------- .../reporting/visual_console_builder.editor.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index fbe5da6276..feea36ca01 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -1068,13 +1068,13 @@ function hiddenFields(item) { enterprise_hiddenFields(item); } - var code_control = tinyMCE.activeEditor.controlManager.controls['text-label_code']; - if (item == 'label') { - code_control.setDisabled(false); - } - else { - code_control.setDisabled(true); - } + //~ var code_control = tinyMCE.activeEditor.controlManager.controls['text-label_code']; + //~ if (item == 'label') { + //~ code_control.setDisabled(false); + //~ } + //~ else { + //~ code_control.setDisabled(true); + //~ } } function cleanFields(item) { diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.php b/pandora_console/godmode/reporting/visual_console_builder.editor.php index c9732c6cd4..74582d46e7 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.php +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.php @@ -208,7 +208,7 @@ ui_require_javascript_file ('encode_decode_base64'); width: "400", height: "200", nowrap: true, - plugins : "noneditable", + plugins : "bbcode", inline_styles : true, valid_children : "+body[style]", element_format : "html",