diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cc96111775..dd2366a725 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-11-28 Sergio Martin + + * include/functions_treeview.php + operation/tree.php: Fix some bugs of treeview + 2012-11-27 Ramon Novoa * include/functions_treeview.php, diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index c428c714c0..3127a8ca63 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -658,6 +658,9 @@ function treeview_getData ($type, $server=false) { break; } + if($list == false) { + $list = array(); + } foreach ($list as $key => $item) { switch ($type) { diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index d004357308..c39d1d9ce7 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -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' => "" + $group_tab = array('text' => "" . html_print_image ("images/group.png", true, array ("title" => __('Groups'))) . "", 'active' => $activeTab == "group"); - $tags_tab = array('text' => "" + $tags_tab = array('text' => "" . html_print_image ("images/tag_red.png", true, array ("title" => __('Tags'))) . "", 'active' => $activeTab == "tag"); $subsections = array('group' => $group_tab, 'tag' => $tags_tab); switch ($activeTab) { @@ -484,7 +485,7 @@ if (! defined ('METACONSOLE')) { } echo "
"; -echo '