diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 125d2c109c..a01437ad78 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2011-09-01 Juan Manuel Ramon + + * include/javascript/jquery.pandora.controls.js: Filter keycount variable + in pandoraSelectGroupAgent javascript function. + * godmode/massive/massive_add_action_alerts.php: Added 'Any' label to + agents combo in this view and correct a typo. + 2011-09-01 Miguel de Dios * operation/agentes/ver_agente.php: fixed the massive deletion alerts with diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php index 5aa19a4b26..9172600a01 100644 --- a/pandora_console/godmode/massive/massive_add_action_alerts.php +++ b/pandora_console/godmode/massive/massive_add_action_alerts.php @@ -117,7 +117,7 @@ if ($add) { $results = false; } - db_pandora_audit("Masive management", "Add alert action " . $id_agent, false, false, 'Agents: ' . + db_pandora_audit("Masive management", "Add alert action " . json_encode($id_agents), false, false, 'Agents: ' . json_encode($id_agents) . ' Alerts : ' . json_encode($agent_alerts) . ' Fires Min: ' . $fires_min . ' Fires Max: ' . $fires_max . ' Action: ' . $action); @@ -153,7 +153,7 @@ $table->data[1][0] .= ''; $table->data[1][1] = html_print_select (agents_get_group_agents ($id_group, false, "none"), - 'id_agents[]', 0, false, '', '', true, true); + 'id_agents[]', 0, false, __('Any'), '', true, true); if (empty($id_agents)) { $alert_templates = ''; diff --git a/pandora_console/include/javascript/jquery.pandora.controls.js b/pandora_console/include/javascript/jquery.pandora.controls.js index 0f96fa9a59..e48cc27970 100644 --- a/pandora_console/include/javascript/jquery.pandora.controls.js +++ b/pandora_console/include/javascript/jquery.pandora.controls.js @@ -39,12 +39,14 @@ }, function (data, status) { jQuery.each (data, function (id, value) { - config.callbackPre (); - option = $("") - .attr ("value", id) - .html (value); - config.callbackPost (id, value, option); - $(config.agentSelect).append (option); + if (id !== 'keycount'){ + config.callbackPre (); + option = $("") + .attr ("value", id) + .html (value); + config.callbackPost (id, value, option); + $(config.agentSelect).append (option); + } }); $(config.loading).hide (); $select.enable ();