diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1033727f70..01f1f514b8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-10-10 Juan Manuel Ramon + + * include/javascript/pandora.js + operation/agentes/ver_agente.php: Fixed multiselect in wizards + of Pandora Console. + 2012-10-10 Miguel de Dios * include/functions_networkmap.php: fixes and changes for the new diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 6e60062d7b..8d78dafaeb 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -164,6 +164,11 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) { selection_mode = 'common'; } + var serialized = $('#hidden-serialized').val(); + if (serialized == undefined) { + serialized = ''; + } + $('#module').attr ('disabled', 1); $('#module').empty (); $('#module').append ($('').html ("Loading...").attr ("value", 0)); @@ -181,7 +186,8 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) { "id_agent[]": idAgents, "all": find_modules, "custom_condition": custom_condition, - "selection_mode": selection_mode + "selection_mode": selection_mode, + "serialized": serialized }, function (data) { $('#module').empty (); diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 4592280891..694e5db5d7 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -166,6 +166,7 @@ if (is_ajax ()) { $idAgents = get_parameter('id_agent'); $custom_condition = get_parameter('custom_condition', ''); $selection_mode = get_parameter('selection_mode', 'common'); + $serialized = get_parameter('serialized', ''); $all = (string)get_parameter('all', 'all'); switch ($all) { @@ -288,7 +289,10 @@ if (is_ajax ()) { $result = array(); foreach($nameModules as $nameModule) { - $result[$nameModule['nombre'].'$*$'.implode('|', $idAgents)] = io_safe_output($nameModule['nombre']); + if (empty($serialized)) + $result[$nameModule['nombre']] = io_safe_output($nameModule['nombre']); + else + $result[$nameModule['nombre'].'$*$'.implode('|', $idAgents)] = io_safe_output($nameModule['nombre']); } }