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

Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop' 

fixed errors in massive operation edit modules

See merge request artica/pandorafms!2101

Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
This commit is contained in:
Daniel Rodriguez 2019-01-15 12:35:11 +01:00
parent 6894623429 ac228a7fad
commit b38dc64ad8
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/massive/massive_delete_modules.php
View File

@ -285,7 +285,7 @@ else {
$filter = false;
}
$names = agents_get_modules (array_keys ($agents),
'DISTINCT(tagente_modulo.nombre)', $filter, false);
'tagente_modulo.nombre', $filter, false);
foreach ($names as $name) {
$modules[$name['nombre']] = $name['nombre'];
}

16
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -51,31 +51,27 @@ if ($update) {
$agents_ = array();
$force = get_parameter('force_type', false);
if ($agents_select == false) {
$agents_select = array();
}
foreach ($agents_select as $agent_name) {
$agents_[] = agents_get_agent_id($agent_name);
}
$agents_ = $agents_select;
$modules_ = $module_name;
}
else if ($selection_mode == 'agents') {
$force = get_parameter('force_group', false);
$agents_ = $agents_id;
$modules_ = $modules_select;
}
$success = 0;
$count = 0;
if ($agents_ == false)
$agents_ = array();
// If the option to select all of one group or module type is checked
if ($force) {
if ($force == 'type') {

4
pandora_console/include/functions_agents.php
View File

@ -1233,8 +1233,8 @@ function agents_get_modules ($id_agent = null, $details = false,
ON tagente.id_agente = tasg.id_agent
WHERE tagente_modulo.delete_pending = 0
AND %s
GROUP BY tagente_modulo.id_agente_modulo
ORDER BY tagente_modulo.nombre',
GROUP BY 1
ORDER BY 1',
($details != 'tagente_modulo.*' && $indexed) ? 'tagente_modulo.id_agente_modulo,' : '',
io_safe_output(implode (",", (array) $details)),
$sql_tags_join,