tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed count total agents when group have propagate acl. Tiquet: #3078

Browse Source
This commit is contained in:
m-lopez-f 2015-12-14 11:19:14 +01:00
parent 861a749654
commit c3e0ccb126
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -263,12 +263,6 @@ else {
// Show only selected groups // Show only selected groups
if ($ag_group > 0) { if ($ag_group > 0) {
$sql = sprintf ('SELECT COUNT(*)
FROM tagente
WHERE id_grupo = %d
%s',
$ag_group, $search_sql);
$total_agents = db_get_sql ($sql);
$ag_groups = array(); $ag_groups = array();
$ag_groups = (array)$ag_group; $ag_groups = (array)$ag_group;
@ -308,11 +302,19 @@ if ($ag_group > 0) {
$sql = oracle_recode_query ($sql, $set); $sql = oracle_recode_query ($sql, $set);
break; break;
} }
$sql_total = sprintf ('SELECT COUNT(*)
FROM tagente
WHERE id_grupo IN (%s)
%s',
implode (",", $ag_groups), $search_sql);
$total_agents = db_get_sql ($sql_total);
} }
else { else {
// Admin user get ANY group, even if they doesnt exist // Admin user get ANY group, even if they doesnt exist
if (check_acl ($config['id_user'], 0, "PM")) { if (check_acl ($config['id_user'], 0, "PM")) {
$sql = sprintf ('SELECT COUNT(*) FROM tagente WHERE 1=1 %s', $search_sql); $sql = sprintf ('SELECT COUNT(*) FROM tagente WHERE 1=1 %s', $search_sql);
$total_agents = db_get_sql ($sql); $total_agents = db_get_sql ($sql);
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
@ -346,6 +348,7 @@ else {
} }
} }
else { else {
// Concatenate AW and AD permisions to get all the possible groups where the user can manage // Concatenate AW and AD permisions to get all the possible groups where the user can manage
$user_groupsAW = users_get_groups ($config['id_user'], 'AW'); $user_groupsAW = users_get_groups ($config['id_user'], 'AW');
$user_groupsAD = users_get_groups ($config['id_user'], 'AD'); $user_groupsAD = users_get_groups ($config['id_user'], 'AD');