tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for the metaconsole

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2015-01-19 13:12:27 +01:00
parent 388c8f2b1b
commit 601cf56007
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/class/Tree.class.php
View File

@ -628,7 +628,7 @@ class Tree {
return $children; return $children;
} }
function __getProcessedItem($itemKey, &$items) { function __getProcessedItem($itemKey, &$items, $server_id = false) {
if (!isset($items[$itemKey])) { if (!isset($items[$itemKey])) {
return false; return false;
} }
@ -642,6 +642,10 @@ class Tree {
$processed_item['name'] = $item['_name_']; $processed_item['name'] = $item['_name_'];
$processed_item['searchChildren'] = 1; $processed_item['searchChildren'] = 1;
if (defined ('METACONSOLE') && $server_id) {
$processed_item['server_id'] = $server_id;
}
if (isset($item['_is_tag_']) && $item['_is_tag_']) { if (isset($item['_is_tag_']) && $item['_is_tag_']) {
$processed_item['type'] = 'tag'; $processed_item['type'] = 'tag';
} }
@ -715,7 +719,7 @@ class Tree {
if (empty($item['_parent_id_'])) if (empty($item['_parent_id_']))
$processed_items[] = __getProcessedItem($key, $items); $processed_items[] = __getProcessedItem($key, $items);
} }
$item_list[$server['id']] = $processed_items; $item_list += $processed_items;
metaconsole_restore_db(); metaconsole_restore_db();
} }