From cef3cb2ae0df1a1f6391408d49cab1509ac2e769 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Thu, 22 Feb 2018 16:13:25 +0100 Subject: [PATCH] [Console Plugins][Console Recon Scripts] Fixed deletion macro --- pandora_console/godmode/servers/plugin.php | 2 +- pandora_console/godmode/servers/recon_script.php | 2 +- pandora_console/include/javascript/pandora_modules.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 9bbb6ccaf2..b8d130715f 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -892,7 +892,7 @@ ui_require_javascript_file('pandora_modules'); // Delete macro var delete_macro_click_event = function (event) { - delete_macro('table-form-plugin_'); + delete_macro_form('table-form-plugin_'); update_preview(); } $('div#delete_macro_button>a').click(delete_macro_click_event); diff --git a/pandora_console/godmode/servers/recon_script.php b/pandora_console/godmode/servers/recon_script.php index 3126264854..0d0965c10f 100644 --- a/pandora_console/godmode/servers/recon_script.php +++ b/pandora_console/godmode/servers/recon_script.php @@ -203,7 +203,7 @@ if (($create != "") OR ($view != "")) { if($i <= 2) { $delete_macro_style = 'display:none;'; } - $datam[2] = '
'.__('Delete macro').' '.html_print_image('images/delete.png',true).'
'; + $datam[2] = '
'.__('Delete macro').' '.html_print_image('images/delete.png',true).'
'; $table->colspan['recon_action'][0] = 2; $table->rowstyle['recon_action'] = 'text-align:center'; diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js index 06b9f5485f..da9660ef6c 100644 --- a/pandora_console/include/javascript/pandora_modules.js +++ b/pandora_console/include/javascript/pandora_modules.js @@ -497,7 +497,7 @@ function configure_modules_form () { // Functions to add and remove dynamic fields for macros -function delete_macro(prefix) { +function delete_macro_form(prefix) { var next_number = parseInt($('#next_macro').html()); // Is not possible delete first macro if (next_number == 3) {