diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3e70653ae9..bd00517098 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-01-21 Sergio Martin + + * include/functions_users.php + godmode/groups/configure_group.php: fixed a problem retrieving + the groups to the combo of set group parent + 2013-01-21 Juan Manuel Ramon pandoradb_data.sql diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index ede4b3a481..4e99781075 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -109,10 +109,7 @@ if ($icon) { $table->data[1][1] .= ''; $table->data[2][0] = __('Parent'); -$sql = 'SELECT id_grupo, nombre FROM tgrupo '; -if ($id_group) - $sql .= sprintf ('WHERE id_grupo != %d', $id_group); -$groups = users_get_groups(); + if ($id_group) { $table->data[2][1] = html_print_select_groups(false, "AR", true, 'id_parent', $id_parent, '', '', '', true, false, true, '', false, false, false, $id_group); diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php index 0e3540fa29..6f5bfc57a0 100644 --- a/pandora_console/include/functions_users.php +++ b/pandora_console/include/functions_users.php @@ -80,7 +80,7 @@ function users_get_all_model_groups () { * @param string The privilege to evaluate, and it is false then no check ACL. * @param boolean $returnAllGroup Flag the return group, by default true. * @param boolean $returnAllColumns Flag to return all columns of groups. - * @param array $id_groups The list of group to scan to bottom child. By default null. + * @param array $id_groups The id of node that must do not show the children and own. * * @return array A list of the groups the user has certain privileges. */ @@ -89,7 +89,7 @@ function users_get_groups_for_select($id_user, $privilege = "AR", $returnAllGro $id_groups = null; } - $user_groups = users_get_groups ($id_user, $privilege, $returnAllGroup, $returnAllColumns, $id_groups); + $user_groups = users_get_groups ($id_user, $privilege, $returnAllGroup, $returnAllColumns); if ($id_groups !== null) { $childrens = groups_get_childrens($id_groups);