From 1850cb9251f0371d6505f81c26a94e81d32adab4 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 18 May 2010 10:03:06 +0000 Subject: [PATCH] 2010-05-18 Miguel de Dios * include/javascript/pandora.js: added function "agent_changed_by_multiple_agents_id" for response to change agent in wizard in visual console editor. * operation/agentes/ver_agente.php: added response to "get_agent_modules_json_for_multiple_agents_id" for the ajax previous function. * godmode/reporting/visual_console_builder.wizard.php: used new javascript function. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 13 ++++ .../visual_console_builder.wizard.php | 2 +- pandora_console/include/javascript/pandora.js | 59 +++++++++++++++++++ .../operation/agentes/ver_agente.php | 10 ++++ 4 files changed, 83 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 242aba4c7f..ca5962b9a8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2010-05-18 Miguel de Dios + + * include/javascript/pandora.js: added function + "agent_changed_by_multiple_agents_id" for response to change agent in + wizard in visual console editor. + + * operation/agentes/ver_agente.php: added response to + "get_agent_modules_json_for_multiple_agents_id" for the ajax previous + function. + + * godmode/reporting/visual_console_builder.wizard.php: used new javascript + function. + 2010-05-17 Sergio Martin * include/languages/cs.po diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php index 359983728b..8de49b88da 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php +++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php @@ -82,6 +82,6 @@ echo ''; \ No newline at end of file diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 84c8023a8a..ca1851c0ba 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -165,6 +165,65 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) { } +/** + * Fill up select box with id "module" with modules after agent has been selected, but this not empty the select box.s + * + * @param event that has been triggered + * @param id_agent Agent ID that has been selected + * @param selected Which module(s) have to be selected + */ +function agent_changed_by_multiple_agents_id (event, id_agent, selected) { + var idAgents = Array(); + + jQuery.each ($("#id_agents option:selected"), function (i, val) { + //val() because the var is same + idAgents.push($(val).val()); + }); + + $('#module').attr ('disabled', 1); + $('#module').empty (); + $('#module').append ($('').html ("Loading...").attr ("value", 0)); + jQuery.post ('ajax.php', + {"page": "operation/agentes/ver_agente", + "get_agent_modules_json_for_multiple_agents_id": 1, + "id_agent[]": idAgents + }, + function (data) { + $('#module').empty (); + + if (typeof($(document).data('text_for_module')) != 'undefined') { + $('#module').append ($('').html ($(document).data('text_for_module')).attr("value", 0).attr('selected', true)); + } + else { + if (typeof(data['any_text']) != 'undefined') { + $('#module').append ($('').html (data['any_text']).attr ("value", 0).attr('selected', true)); + } + else { + var anyText = $("#any_text").html(); //Trick for catch the translate text. + + if (anyText == null) { + anyText = 'Any'; + } + + $('#module').append ($('').html (anyText).attr ("value", 0).attr('selected', true)); + } + } + + jQuery.each (data, function (i, val) { + s = js_html_entity_decode(val['nombre']); + //$('#module').append ($('').html (s).attr ("value", val)); + $('#module').append ($('').html (s).attr ("value", val['id_agente_modulo'])); + $('#module').fadeIn ('normal'); + }); + if (selected != undefined) + $('#module').attr ('value', selected); + $('#module').attr ('disabled', 0); + }, + "json" + ); +} + + /** * Autocomplete Agent box and module selector functions. * diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index a216aec692..3b129900b1 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -32,6 +32,7 @@ if (is_ajax ()) { $get_agent_status_tooltip = (bool) get_parameter ("get_agent_status_tooltip"); $get_agents_group_json = (bool) get_parameter ("get_agents_group_json"); $get_agent_modules_json_for_multiple_agents = (bool) get_parameter("get_agent_modules_json_for_multiple_agents"); + $get_agent_modules_json_for_multiple_agents_id = (bool) get_parameter("get_agent_modules_json_for_multiple_agents_id"); if ($get_agents_group_json) { $id_group = get_parameter('id_group'); @@ -62,6 +63,15 @@ if (is_ajax ()) { return; } + if ($get_agent_modules_json_for_multiple_agents_id) { + $idAgents = get_parameter('id_agent'); + + $nameModules = get_db_all_rows_sql('SELECT nombre, id_agente_modulo FROM tagente_modulo WHERE id_agente IN (' . implode(',', $idAgents) . ')'); + + echo json_encode($nameModules); + return; + } + if ($get_agent_modules_json_for_multiple_agents) { $idAgents = get_parameter('id_agent');