From 7c21b508c580bcf9826dc7348551a3375272bc58 Mon Sep 17 00:00:00 2001 From: Vanessa Gil Date: Tue, 7 Oct 2014 16:33:54 +0200 Subject: [PATCH] Fixed link to event list in service map. --- pandora_console/operation/events/events.php | 20 +++++++++++++++++-- .../operation/events/events_list.php | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index ebc6c07221..fbe612946d 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -200,8 +200,6 @@ $group_rep = (int) get_parameter ("group_rep", 1); $delete = (bool) get_parameter ("delete"); $validate = (bool) get_parameter ("validate", 0); $section = (string) get_parameter ("section", "list"); -$text_agent = (string) get_parameter('text_agent', __("All")); -$text_module = (string) get_parameter('module_search', ''); $filter_only_alert = (int) get_parameter('filter_only_alert', -1); $filter_id = (int) get_parameter('filter_id', 0); $id_name = (string) get_parameter('id_name', ''); @@ -210,6 +208,24 @@ $date_from = (string)get_parameter('date_from', ''); $date_to = (string)get_parameter('date_to', ''); $text_agent = (string) get_parameter("text_agent", __("All")); +$id_agent = get_parameter('id_agent', 0); +if ($id_agent != 0) { + $text_agent = db_get_value('nombre', 'tagente', 'id_agente', $id_agent); + if ($text_agent == false) { + $text_agent = ''; + } +} + + +$text_module = (string) get_parameter('module_search', ''); +$id_agent_module = get_parameter('id_agent_module', 0); +if ($id_agent_module != 0) { + $text_module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id_agent_module); + if ($text_module == false) { + $text_module = ''; + } +} + $tag_with_json = base64_decode(get_parameter("tag_with", '')) ; $tag_with_json_clean = io_safe_output($tag_with_json); diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index a6527cd648..127cafd831 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -386,7 +386,7 @@ $data[0] .= html_print_select($user_users, "id_user_ack", $id_user_ack, '', if (!$meta) { $data[1] = __('Module search') . '
'; $data[1] .= html_print_autocomplete_modules('module_search', - '', false, true, '', array(), true); + $text_module, false, true, '', array(), true); } else { $data[1] .= '';