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

Fixed sql error when searchs in empty father groups. Ticket#3347

This commit is contained in:
Arturo Gonzalez 2016-02-05 12:31:20 +01:00
parent 6e1b0d32be
commit be166593cb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_groupview.php
View File

@ -670,6 +670,7 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
//Eliminate the first comma //Eliminate the first comma
$fathers_id = substr($fathers_id, 1); $fathers_id = substr($fathers_id, 1);
//Takes the parents even without agents, complete groups //Takes the parents even without agents, complete groups
if ($fathers_id) {
$list_father_groups = db_get_all_rows_sql(" $list_father_groups = db_get_all_rows_sql("
SELECT * SELECT *
FROM tgrupo FROM tgrupo
@ -679,6 +680,7 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
//Merges the arrays and eliminates the duplicates groups //Merges the arrays and eliminates the duplicates groups
$list_groups = array_merge($list_groups, $list_father_groups); $list_groups = array_merge($list_groups, $list_father_groups);
} }
}
$list_groups = groupview_array_unique_multidim($list_groups, 'id_grupo'); $list_groups = groupview_array_unique_multidim($list_groups, 'id_grupo');
//Order groups (Father-children) //Order groups (Father-children)
$ordered_groups = groupview_order_groups_for_parents($list_groups); $ordered_groups = groupview_order_groups_for_parents($list_groups);