From 28aba1c646bdabdea8b2e5532046386d8c3cf2be Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Tue, 10 Nov 2015 10:06:51 +0100
Subject: [PATCH] Add not hidden parts of tactical view when this view have
refresh. Tiquet: #2956
(cherry picked from commit efabeb887bf7bb0aaa8b324ec75f2c88f8d50ed9)
---
pandora_console/godmode/servers/servers.build_table.php | 3 ++-
pandora_console/operation/agentes/tactical.php | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 75c619ab72..0ae432f682 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -29,6 +29,7 @@ if (! check_acl ($config["id_user"], 0, "AW")) {
}
global $tiny;
+global $hidden_toggle;
$servers = servers_get_info();
if ($servers === false) {
@@ -185,7 +186,7 @@ if ($tiny) {
unset($table->head[8]);
}
if ($tiny) {
- ui_toggle(html_print_table ($table,true), __('Tactical server information'));
+ ui_toggle(html_print_table ($table,true), __('Tactical server information'),false,$hidden_toggle);
}
else {
html_print_table ($table);
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index f3f5bc8088..27f4dda944 100755
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -35,6 +35,7 @@ $is_admin = check_acl ($config['id_user'], 0, "PM");
$user_strict = (bool) db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
$force_refresh = get_parameter ("force_refresh", "");
+$refresh = get_parameter ("refr", 0);
if ($force_refresh == 1) {
db_process_sql ("UPDATE tgroup_stat SET utimestamp = 0");
}
@@ -223,6 +224,9 @@ echo '<td style="vertical-align: top; width: 75%; padding-top: 0px;" id="rightco
// ---------------------------------------------------------------------
// Last events information
// ---------------------------------------------------------------------
+$hidden_toggle = true;
+if ($refresh > 0 )
+ $hidden_toggle = false;
$acltags = tags_get_user_module_and_tags ($config['id_user'], $access = 'ER', $user_strict);
@@ -231,7 +235,7 @@ if (!empty($acltags)) {
if (!empty($tags_condition)) {
$events = events_print_event_table ("estado<>1 AND ($tags_condition)", 10, "100%",true,false,true);
- ui_toggle($events, __('Latest events'));
+ ui_toggle($events, __('Latest events'),false,$hidden_toggle);
}
}