From 2dd10a4328474af21007c162126f721f6e1fd941 Mon Sep 17 00:00:00 2001 From: "tatiana.llorente@artica.es" Date: Tue, 2 Oct 2018 12:35:20 +0200 Subject: [PATCH] Added number of times an alert is fired - #2827 --- pandora_console/extensions/agents_alerts.php | 2 +- pandora_console/godmode/alerts/alert_list.list.php | 2 +- pandora_console/godmode/alerts/alert_view.php | 2 +- pandora_console/include/functions_ui.php | 2 +- pandora_console/mobile/operation/alerts.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php index ccc1539fdc..7669fa00c5 100755 --- a/pandora_console/extensions/agents_alerts.php +++ b/pandora_console/extensions/agents_alerts.php @@ -472,7 +472,7 @@ function print_alerts_summary_modal_window($id, $alerts) { if ($alert["times_fired"] > 0) { $status = STATUS_ALERT_FIRED; - $title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); + $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)'); } elseif ($alert["disabled"] > 0) { $status = STATUS_ALERT_DISABLED; diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 1737ed1a7d..cfd987fc58 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -645,7 +645,7 @@ foreach ($simple_alerts as $alert) { if ($alert["times_fired"] > 0) { $status = STATUS_ALERT_FIRED; - $title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); + $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)'); } elseif ($alert["disabled"] > 0) { $status = STATUS_ALERT_DISABLED; diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php index 6655f3009e..cd09e556ec 100644 --- a/pandora_console/godmode/alerts/alert_view.php +++ b/pandora_console/godmode/alerts/alert_view.php @@ -82,7 +82,7 @@ $table_details->data[] = $data; if ($alert["times_fired"] > 0) { $status = STATUS_ALERT_FIRED; - $title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); + $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)'); } elseif ($alert["disabled"] > 0) { $status = STATUS_ALERT_DISABLED; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index ee0cbca2de..7c8dd4bb17 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -958,7 +958,7 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f if ($alert["times_fired"] > 0) { $status = STATUS_ALERT_FIRED; - $title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); + $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)'); } elseif ($alert["disabled"] > 0) { $status = STATUS_ALERT_DISABLED; diff --git a/pandora_console/mobile/operation/alerts.php b/pandora_console/mobile/operation/alerts.php index 8a9e67f47e..cf9c89272f 100644 --- a/pandora_console/mobile/operation/alerts.php +++ b/pandora_console/mobile/operation/alerts.php @@ -250,7 +250,7 @@ class Alerts { if ($alert["times_fired"] > 0) { $status = STATUS_ALERT_FIRED; - $title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); + $title = __('Alert fired').' '.$alert["internal_counter"].' '.__('time(s)'); } elseif ($alert["disabled"] > 0) { $status = STATUS_ALERT_DISABLED;