From dc1dc7012ce4364347dbfcbb0d61946044988dc0 Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Mon, 16 Mar 2015 11:47:12 +0100 Subject: [PATCH] display data changed depending if compare dates or show date directly in the tree view #1976 (cherry picked from commit 93a2d15b2c906fd9cd8e5fc07f19c352743b98b1) --- pandora_console/include/ajax/module.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 649c7f2997..dc1b29dae1 100644 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -168,13 +168,22 @@ if ($get_module_detail) { "modules_format_data", "align" => "left", "width" => "230px"), - "Time" => array( + ); + + if($config['prominent_time']=='comparation'){ + $columns["Time"] = array( "utimestamp", "modules_format_time", "align" => "left", - "width" => "50px") - ); - + "width" => "50px"); + }else{ + $columns["Timestamp"] = array( + "utimestamp", + "modules_format_timestamp", + "align" => "left", + "width" => "50px"); + } + if ($selection_mode == "fromnow") { $date = get_system_time(); $period = $period;