From 38b98cf058f2266782eebd8a3d1692d68fa765b7 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 8 Sep 2010 16:41:05 +0000 Subject: [PATCH] 2010-09-08 Miguel de Dios * godmode/alerts/alert_list.list.php: fixed the pagination when the list of alerts show into alert tab in agent config page. Fixes: #3055920 * godmode/alerts/alert_list.php: cleaned source code. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3228 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/godmode/alerts/alert_list.list.php | 7 ++++++- pandora_console/godmode/alerts/alert_list.php | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2f9fb0794a..90228f8887 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2010-09-08 Miguel de Dios + + * godmode/alerts/alert_list.list.php: fixed the pagination when the list of + alerts show into alert tab in agent config page. + + Fixes: #3055920 + + * godmode/alerts/alert_list.php: cleaned source code. + 2010-09-08 Ramon Novoa * include/functions_reporting.php, diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index cce4d46c83..3c565f02a8 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -224,7 +224,12 @@ switch ($sortField) { break; } -pagination ($total, 'index.php?sec=gagente&sec2=godmode/alerts/alert_list'); +if ($id_agente) { + pagination ($total, 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente=' . $id_agente); +} +else { + pagination ($total, 'index.php?sec=gagente&sec2=godmode/alerts/alert_list'); +} $simple_alerts = get_agent_alerts_simple (array_keys ($agents), false, array ('offset' => (int) get_parameter ('offset'), 'limit' => $config['block_size'], 'order' => $order), $where, false); diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 45a21b382a..5cd4be672c 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -151,7 +151,6 @@ if ($disable_alert) { $messageAction = print_result_message ($result, __('Successfully disabled'), __('Could not be disabled'), '', true); } -// Header if ($id_agente) { $agents = array ($id_agente => get_agent_name ($id_agente));