From eada8e0652ca2dc9116b247ebc421adc3fd76547 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 12 Jul 2023 11:26:33 +0200 Subject: [PATCH] #11687 fix errors agents and checks --- .../godmode/massive/massive_delete_modules.php | 12 +++--------- pandora_console/include/functions_tags.php | 10 ++++++++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php index a33ddc0dca..a8429ad62f 100755 --- a/pandora_console/godmode/massive/massive_delete_modules.php +++ b/pandora_console/godmode/massive/massive_delete_modules.php @@ -654,7 +654,9 @@ $(document).ready (function () { $("#module_name").trigger('change'); } else { $("#module_name option").prop('selected', false); - $("#module_name").trigger('change'); + if ($('#agents_selection_mode :selected').val() === 'all'){ + $("#module_name").trigger('change'); + } } }); @@ -797,14 +799,6 @@ $(document).ready (function () { else if (this.id == "checkbox-recursion") { $("#groups_select").trigger("change"); } - else { - if (this.checked) { - $(".select_agents_row_2").css('display', 'none'); - } - else { - $(".select_agents_row_2").css('display', ''); - } - } } ); diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php index b2341ff6c9..90213d96dd 100644 --- a/pandora_console/include/functions_tags.php +++ b/pandora_console/include/functions_tags.php @@ -795,8 +795,14 @@ function tags_get_acl_tags( $acltags = []; foreach ($raw_acltags as $group => $taglist) { - if (empty($id_group) === false && array_key_exists($group, $id_group) === false) { - continue; + if ($return_mode === 'module_condition') { + if (!empty($id_group) && !in_array($group, $id_group)) { + continue; + } + } else { + if (empty($id_group) === false && array_key_exists($group, $id_group) === false) { + continue; + } } if (!empty($taglist)) {