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

2012-02-09 Sergio Martin <sergio.martin@artica.es> 

* godmode/groups/group_list.php: Cleaned old code used in
	policy filter ajax call




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5539 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-02-09 18:04:26 +00:00
parent 513a18f603
commit 25000e0bd9
2 changed files with 6 additions and 3 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 @@
2012-02-09 Sergio Martin <sergio.martin@artica.es>
* godmode/groups/group_list.php: Cleaned old code used in
policy filter ajax call
2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php: Changed toggle filter in this * operation/events/events_list.php: Changed toggle filter in this

4
pandora_console/godmode/groups/group_list.php
View File

@ -65,7 +65,6 @@ if (is_ajax ()) {
$id_group = (int) get_parameter ('id_group'); $id_group = (int) get_parameter ('id_group');
$disabled = (int) get_parameter ('disabled', 0); $disabled = (int) get_parameter ('disabled', 0);
$search = (string) get_parameter ('search', ''); $search = (string) get_parameter ('search', '');
$keycount = (int) get_parameter ('keycount', 0);
$recursion = (int) get_parameter ('recursion', 0); $recursion = (int) get_parameter ('recursion', 0);
if (! check_acl ($config['id_user'], $id_group, "AR")) { if (! check_acl ($config['id_user'], $id_group, "AR")) {
@ -81,8 +80,7 @@ if (is_ajax ()) {
$filter['string'] = $search; $filter['string'] = $search;
} }
$agents['keycount'] = $keycount; $agents = agents_get_group_agents ($id_group, $filter, "none", false, $recursion);
$agents = $agents + agents_get_group_agents ($id_group, $filter, "none", false, $recursion);
echo json_encode ($agents); echo json_encode ($agents);
return; return;
} }