From cfce014ad360089ab786d4762d34513ce90cfc61 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Thu, 19 Jan 2017 10:13:59 +0100 Subject: [PATCH] UX console in progress... (Fixed filter form in policy modules) --- .../godmode/agentes/module_manager.php | 20 ++++++++++--------- pandora_console/include/functions_modules.php | 1 + 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index aeb98f2ff9..c4a4311cbe 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -115,16 +115,18 @@ if (($policy_page) || (isset($agent))) { if ($show_creation) { // Create module/type combo echo '
'; - echo ''; - echo __('Show in hierachy mode'); - if ($checked == "true") { - $checked = true; + if (!$policy_page) { + echo ''; + echo __('Show in hierachy mode'); + if ($checked == "true") { + $checked = true; + } + else { + $checked = false; + } + html_print_checkbox ('status_hierachy_mode', "", $checked, false, false, "onChange=change_mod_filter();"); + echo ''; } - else { - $checked = false; - } - html_print_checkbox ('status_hierachy_mode', "", $checked, false, false, "onChange=change_mod_filter();"); - echo ''; echo ''; echo __("Type"); html_print_select ($modules, 'moduletype', '', '', '', '', false, false, false, '', false, 'max-width:300px;' ); diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 466ec04fcf..8dd24cd3ed 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -2535,6 +2535,7 @@ function recursive_modules_tree (&$new_modules, &$new_modules_child, $i, $child) foreach ($new_modules as $index => $module) { if ($module['id_agente_modulo'] == $child['parent_module_id']) { $new_modules[$index]['child'][] = $child; + $new_modules[$index]['have_childs'] = true; unset($new_modules_child[$i]); break; }