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-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop' 

Fix recursion and filter on modules massive operations

See merge request artica/pandorafms!4477
This commit is contained in:
Daniel Rodriguez 2021-11-15 11:29:33 +00:00
parent c5a86e2782 7daf138ef5
commit d094987eda
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/javascript/pandora.js
View File

@ -134,7 +134,8 @@ function agent_changed_by_multiple_agents(event, id_agent, selected) {
$("input.module_types_excluded").each(function(index, el) { $("input.module_types_excluded").each(function(index, el) {
var module_type = parseInt($(el).val()); var module_type = parseInt($(el).val());
if (module_type !== NaN) module_types_excluded.push(module_type); if (isNaN(module_type) == false)
module_types_excluded.push(module_type);
}); });
} catch (error) {} } catch (error) {}
} }

4
pandora_console/operation/agentes/ver_agente.php
View File

@ -91,7 +91,7 @@ if (is_ajax()) {
if ($get_agents_group_json) { if ($get_agents_group_json) {
$id_group = (int) get_parameter('id_group'); $id_group = (int) get_parameter('id_group');
$recursion = (get_parameter_switch('recursion', 'false') === 'true'); $recursion = filter_var(get_parameter_switch('recursion', 'false'), FILTER_VALIDATE_BOOLEAN);
$id_os = get_parameter('id_os', ''); $id_os = get_parameter('id_os', '');
$agent_name = get_parameter('name', ''); $agent_name = get_parameter('name', '');
@ -801,7 +801,7 @@ if (is_ajax()) {
} }
} else { } else {
$sql = sprintf( $sql = sprintf(
'SELECT DISTINCT t1.nombre, t1.id_agente_modulo FROM tagente_modulo t1 'SELECT t1.nombre, t1.id_agente_modulo FROM tagente_modulo t1
INNER JOIN tagente_estado t2 ON t1.id_agente_modulo = t2.id_agente_modulo INNER JOIN tagente_estado t2 ON t1.id_agente_modulo = t2.id_agente_modulo
%s WHERE %s AND t1.delete_pending = 0 %s WHERE %s AND t1.delete_pending = 0
AND t1.id_agente IN ('.implode(',', $idAgents).') AND t1.id_agente IN ('.implode(',', $idAgents).')