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

2013-09-23 Sergio Martin <sergio.martin@artica.es> 

* include/functions_groups.php: Fix groups in tree way
	when All group is not exist



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8799 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-09-23 10:59:29 +00:00
parent 358e98d497
commit bad009699b
2 changed files with 13 additions and 1 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 @@
2013-09-23 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php: Fix groups in tree way
when All group is not exist
2013-09-22 Junichi Satoh <junichi@rworks.jp> 2013-09-22 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alert_config.php: Translated new sentences. * include/help/ja/help_alert_config.php: Translated new sentences.

9
pandora_console/include/functions_groups.php
View File

@ -498,7 +498,14 @@ function groups_get_groups_tree_recursive($groups, $trash = 0, $trash2 = 0) {
$tree[$group['parent']]['branch'][$key] = &$tree[$key]; $tree[$group['parent']]['branch'][$key] = &$tree[$key];
} }
$tree = array($tree[0]);
// Depends on the All group we give different format
if (isset($groups[0])) {
$tree = array($tree[0]);
}
else {
$tree = $tree[0]['branch'];
}
$return = groups_flatten_tree_groups($tree, 0); $return = groups_flatten_tree_groups($tree, 0);