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

2013-01-21 Sergio Martin <sergio.martin@artica.es> 

* include/functions_users.php
	godmode/groups/configure_group.php: fixed a problem retrieving
	the groups to the combo of set group parent



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7515 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-01-21 14:02:06 +00:00
parent 3953a28a4c
commit 75b2509e52
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-01-21 Sergio Martin <sergio.martin@artica.es>
* 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 <juanmanuel.ramon@artica.es>
pandoradb_data.sql

5
pandora_console/godmode/groups/configure_group.php
View File

@ -109,10 +109,7 @@ if ($icon) {
$table->data[1][1] .= '</span>';
$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);

4
pandora_console/include/functions_users.php
View File

@ -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);