From 80294df5f4a3bd802ba47f61e20de814e0e0de2f Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Mon, 14 Nov 2011 09:02:54 +0000 Subject: [PATCH] 2011-11-14 Juan Manuel Ramon * include/functions_menu.php include/config_process.php operation/menu.php godmode/menu.php godmode/reporting/visual_console_builder.php: Preserve autorefresh time from visual console like global autorefresh parameter. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5131 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/godmode/menu.php | 14 ++++++++++++-- .../godmode/reporting/visual_console_builder.php | 5 +++++ pandora_console/include/config_process.php | 5 +++++ pandora_console/include/functions_menu.php | 7 +++---- pandora_console/operation/menu.php | 16 +++++++++++++--- 6 files changed, 47 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d68ec007c9..bfed53116d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-11-14 Juan Manuel Ramon + + * include/functions_menu.php + include/config_process.php + operation/menu.php + godmode/menu.php + godmode/reporting/visual_console_builder.php: Preserve autorefresh + time from visual console like global autorefresh parameter. + 2011-11-12 Junichi Satoh * general/logon_ok.php: Fixed bad representation that __('ago') is diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index c64f1286ec..6643429986 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -153,7 +153,12 @@ if (check_acl ($config['id_user'], 0, "IW")) { if ($config['activate_gis']) { $menu["godgismaps"]["text"] = __('GIS Maps builder'); $menu["godgismaps"]["sec2"] = "godmode/gis_maps/index"; - $menu["godgismaps"]["refr"] = 60; + if (isset($config['refr'])){ + $menu["godgismaps"]["refr"] = $config['refr']; + } + else{ + $menu["godgismaps"]["refr"] = 60; + } $menu["godgismaps"]["id"] = "god-gismaps"; } } @@ -254,7 +259,12 @@ if (check_acl ($config['id_user'], 0, "PM")) { if (array_key_exists('fatherId',$extmenu)) { if (strlen($extmenu['fatherId']) > 0) { $menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["text"] = __($extmenu['name']); - $menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = 60; + if (isset($config['refr'])){ + $menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = $config['refr']; + } + else{ + $menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["refr"] = 60; + } $menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["icon"] = $extmenu['icon']; $menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["sec"] = 'gextensions'; $menu[$extmenu['fatherId']]['sub'][$extmenu['sec2']]["extension"] = true; diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index a7e67b3e5b..4264f2b160 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -117,6 +117,11 @@ switch ($activeTab) { //Update elements in visual map $idsElements = db_get_all_rows_filter('tlayout_data', array('id_layout' => $idVisualConsole), array('id')); + + if ($idsElements === false){ + $idsElements = array(); + } + foreach ($idsElements as $idElement) { $id = $idElement['id']; $values = array(); diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 98317039cc..37df64013c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -161,4 +161,9 @@ require_once("include_graph_dependencies.php"); include_graphs_dependencies($config['homedir'].'/'); +// Updates autorefresh time +if (isset($_POST['refr'])){ + config_update_value ('refr', get_parameter('refr', $config['refr'])); +} + ?> diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index 6e4a5cd138..37b794a64f 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -27,7 +27,7 @@ function menu_print_menu (&$menu) { global $config; static $idcounter = 0; - + echo '
'; $sec = (string) get_parameter ('sec'); @@ -118,7 +118,6 @@ function menu_print_menu (&$menu) { //Else it's not selected $class = 'submenu_not_selected'; } - if (! isset ($sub["refr"])) { $sub["refr"] = 0; } @@ -185,8 +184,8 @@ function menu_print_menu (&$menu) { } else { $title = ''; } - $submenu_output .= ''.$sub["text"].''; - $submenu_output .= ''; + $submenu_output .= ''.$sub["text"].''; + $submenu_output .= ''; } } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index b5c8ed8ce1..d3a4246e9d 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -94,7 +94,12 @@ if (check_acl ($config['id_user'], 0, "AR")) { //Visual console $menu["visualc"]["text"] = __('Visual console'); $menu["visualc"]["sec2"] = "operation/visual_console/index"; - $menu["visualc"]["refr"] = 60; + if (isset($config['refr'])){ + $menu["visualc"]["refr"] = $config['refr']; + } + else{ + $menu["visualc"]["refr"] = 60; + } $menu["visualc"]["id"] = "oper-visualc"; $sub = array (); @@ -123,7 +128,12 @@ if (check_acl ($config['id_user'], 0, "AR")) { } $sub["operation/visual_console/render_view&id=".$layout["id"]]["text"] = mb_substr ($name, 0, 19); $sub["operation/visual_console/render_view&id=".$layout["id"]]["title"] = $name; - $sub["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = 0; + if (isset($config['refr'])){ + $sub["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = $config['refr']; + } + else{ + $sub["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = 0; + } } $menu["visualc"]["sub"] = $sub; @@ -305,5 +315,5 @@ if (check_acl ($config['id_user'], 0, "AR")) { } -menu_print_menu ($menu); +menu_print_menu ($menu, true); ?>