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

Merge branch 'ent-4315-No-funcionan-las-politicas-en-meta' into 'develop' 

fix bug in api function that removes an agent from a policy

See merge request artica/pandorafms!2579
This commit is contained in:
Alejandro Fraguas 2019-07-05 10:36:15 +02:00
parent 8229f634e0 a10945d209
commit da110f1d33
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_api.php
View File

@ -15059,17 +15059,18 @@ function remove_agent_from_policy($id_policy, $use_agent_name, $params)
if (is_metaconsole()) { if (is_metaconsole()) {
if ($use_agent_name === false) { if ($use_agent_name === false) {
$id_node = $params[1]; $id_node = $params[1];
$id_agent = db_get_value_filter('id_agente', 'tmetaconsole_agent', ['id_tagente' => $params[0], 'id_tmetaconsole_setup' => $id_node]); $id_agent = $params[0];
} else { } else {
$id_agent = db_get_value_filter('id_agente', 'tmetaconsole_agent', ['nombre' => $params[0]]); $id_node = db_get_value_filter('id_tmetaconsole_setup', 'tmetaconsole_agent', ['nombre' => $params[0]]);
$id_agent = db_get_value_filter('id_tagente', 'tmetaconsole_agent', ['nombre' => $params[0]]);
} }
$agent = db_get_row_filter('tmetaconsole_agent', ['id_agente' => $id_agent]); $agent = db_get_row_filter('tmetaconsole_agent', ['id_tagente' => $id_agent, 'id_tmetaconsole_setup' => $id_node]);
} }
$policy = policies_get_policy($id_policy, false, false); $policy = policies_get_policy($id_policy, false, false);
$policy_agent = db_get_row_filter('tpolicy_agents', ['id_policy' => $id_policy, 'id_agent' => $id_agent]); $policy_agent = (is_metaconsole()) ? db_get_row_filter('tpolicy_agents', ['id_policy' => $id_policy, 'id_agent' => $id_agent, 'id_node' => $id_node]) : db_get_row_filter('tpolicy_agents', ['id_policy' => $id_policy, 'id_agent' => $id_agent]);
if (empty($policy)) { if (empty($policy)) {
returnError('error_policy', __('This policy does not exist.')); returnError('error_policy', __('This policy does not exist.'));