From 7b09c1e9430b20697c7d9232571217d1d8fa489f Mon Sep 17 00:00:00 2001 From: Luis Date: Fri, 7 Aug 2020 09:40:46 +0200 Subject: [PATCH] Ent 6029 meta groups delete bug --- pandora_console/godmode/groups/group_list.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 1f7284ca5b..ddb06070b5 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -35,12 +35,15 @@ global $config; check_login(); -enterprise_hook('open_meta_frame'); - require_once $config['homedir'].'/include/functions_groups.php'; require_once $config['homedir'].'/include/functions_agents.php'; require_once $config['homedir'].'/include/functions_users.php'; -enterprise_include_once('meta/include/functions_agents_meta.php'); + +if (is_metaconsole()) { + enterprise_include_once('include/functions_metaconsole.php'); + enterprise_include_once('meta/include/functions_agents_meta.php'); + enterprise_hook('open_meta_frame'); +} if (is_ajax()) { if (! check_acl($config['id_user'], 0, 'AR')) { @@ -714,7 +717,12 @@ if ($tab == 'tree') { foreach ($groups as $key => $group) { $url = 'index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo']; - $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo']; + if (is_metaconsole()) { + $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'].'&tab=groups'; + } else { + $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo']; + } + $table->data[$key][0] = $group['id_grupo']; $table->data[$key][1] = ''.$group['nombre'].''; if ($group['icon'] != '') {