tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop'

Browse Source 
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
This commit is contained in:
Daniel Rodriguez 2021-08-02 07:18:02 +00:00
commit 2963d67225
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/agentes/agent_manager.php
View File

@ -500,7 +500,10 @@ if (enterprise_installed()) {
false,
// Delete_groups.
// Do not show the primary group in this selection.
array_merge(($secondary_groups_selected['plain'] ?? []), [$agent['id_grupo']])
array_merge(
(empty($secondary_groups_selected['plain']) === false) ? $secondary_groups_selected['plain'] : [],
[$agent['id_grupo']]
)
// Include_groups.
// Size.
// Simple_multiple_options.

2
pandora_console/include/functions_events.php
View File

@ -4843,7 +4843,7 @@ function events_page_general($event)
if (isset($event['id_agente']) && $event['id_agente'] > 0) {
enterprise_include_once('include/functions_agents.php');
$secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$event['id_agente'], is_metaconsole()]);
if (!empty($secondary_groups_selected)) {
if (empty($secondary_groups_selected['for_select']) === false) {
$secondary_groups = implode(', ', $secondary_groups_selected['for_select']);
}
}

2
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -388,7 +388,7 @@ $table_contact->data[] = $data;
$data = [];
$data[0] = '<b>'.__('Secondary groups').'</b>';
$secondary_groups = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
if (!$secondary_groups) {
if (empty($secondary_groups['for_select']) === true) {
$data[1] = '<em>'.__('N/A').'</em>';
} else {
$secondary_links = [];