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

Merge branch '1656-Group-recursion-no-funciona-correctamente-en-operaciones-masivas-dev' into 'develop' 

Fixed group recursion in bulk operation

See merge request artica/pandorafms!1133
This commit is contained in:
vgilc 2018-01-29 12:52:35 +01:00
parent 8ec7d21932 caa3539c4f
commit 34ccc01c7b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/massive/massive_edit_agents.php
View File

@ -259,7 +259,7 @@ $table->data[0][0] = __('Group');
$table->data[0][1] = html_print_select_groups(false, "AW", true,
'id_group', $id_group, false, '', '', true);
$table->data[0][2] = __('Group recursion');
$table->data[0][3] = html_print_checkbox ("recursion", 1, $recursion,
$table->data[0][3] = html_print_checkbox ("recursion2", 1, $recursion,
true, false);
@ -626,7 +626,7 @@ $(document).ready (function () {
$("select#id_os").pandoraSelectOS ();
var recursion;
$("#checkbox-recursion").click(function () {
$("#checkbox-recursion2").click(function () {
recursion = this.checked ? 1 : 0;
$("#id_group").trigger("change");
});

6
pandora_console/include/functions_users.php
View File

@ -255,7 +255,11 @@ function users_get_groups ($id_user = false, $privilege = "AR", $returnAllGroup
$user_groups[$group[$keys_field]] = $group['nombre'];
}
}
if (!empty($id_groups)) {
$user_groups = array_intersect_key($user_groups,array_flip($id_groups));
}
return $user_groups;
}