tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-11-28 Sergio Martin <sergio.martin@artica.es> 

* include/functions_treeview.php
	operation/tree.php: Fix some bugs of treeview



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7194 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-11-28 09:58:42 +00:00
parent 4110c7c954
commit 53d8d65271
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-11-28 Sergio Martin <sergio.martin@artica.es>
* include/functions_treeview.php
operation/tree.php: Fix some bugs of treeview
2012-11-27 Ramon Novoa <rnovoa@artica.es>
* include/functions_treeview.php,

3
pandora_console/include/functions_treeview.php
View File

@ -658,6 +658,9 @@ function treeview_getData ($type, $server=false) {
break;
}
if($list == false) {
$list = array();
}
foreach ($list as $key => $item) {
switch ($type) {

7
pandora_console/operation/tree.php
View File

@ -403,6 +403,7 @@ include_once($config['homedir'] . "/include/functions_reporting.php");
include_once($config['homedir'] . "/include/functions_ui.php");
global $config;
$pure = get_parameter('pure', 0);
$enterpriseEnable = false;
if (enterprise_include_once('include/functions_policies.php') !== ENTERPRISE_NOT_HOOK) {
@ -464,10 +465,10 @@ if (! defined ('METACONSOLE')) {
$img_style = array ("class" => "top", "width" => 16);
$activeTab = get_parameter('tab','group');
$group_tab = array('text' => "<a href='index.php?sec=monitoring&sec2=operation/tree&refr=0&tab=group'>"
$group_tab = array('text' => "<a href='index.php?sec=monitoring&sec2=operation/tree&refr=0&tab=group&pure=$pure'>"
. html_print_image ("images/group.png", true, array ("title" => __('Groups'))) . "</a>",
'active' => $activeTab == "group");
$tags_tab = array('text' => "<a href='index.php?&sec=monitoring&sec2=operation/tree&refr=0&tab=tag'>"
$tags_tab = array('text' => "<a href='index.php?&sec=monitoring&sec2=operation/tree&refr=0&tab=tag&pure=$pure'>"
. html_print_image ("images/tag_red.png", true, array ("title" => __('Tags'))) . "</a>", 'active' => $activeTab == "tag");
$subsections = array('group' => $group_tab, 'tag' => $tags_tab);
switch ($activeTab) {
@ -484,7 +485,7 @@ if (! defined ('METACONSOLE')) {
}
echo "<br>";
echo '<form id="tree_search" method="post" action="index.php?extension_in_menu=estado&sec=estado&sec2=operation/tree&refr=0&sort_by='.$activeTab.'">';
echo '<form id="tree_search" method="post" action="index.php?extension_in_menu=estado&sec=estado&sec2=operation/tree&refr=0&sort_by='.$activeTab.'&pure='.$pure.'">';
echo "<b>" . __('Agent status') . "</b>";
$search_free = get_parameter('search_free', '');