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

Merge branch 'ent-7749-mover-operaciones-masivas-sobre-servicios-a-wizard-de-servicios-en-nodo' into 'develop' 

move bulk operations services pandora_enterprise#7749

pandora_enterprise#7749

See merge request artica/pandorafms!5033
This commit is contained in:
Jimmy Olano 2022-09-08 23:55:55 +00:00
parent c927188b27 f6c2a40fe1
commit 6706f59ae1
5 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -880,7 +880,7 @@ $table->data[4][1] = html_print_select(
[
'once' => __('Once'),
'periodically' => __('Periodically'),
'cron' => __('Cron from/to'),
'cron' => __('Cron from/to'),
],
'type_execution',
$type_execution,

17
pandora_console/godmode/massive/massive_operations.php
View File

@ -114,11 +114,6 @@ if ($satellite_options != ENTERPRISE_NOT_HOOK) {
$options_satellite = array_merge($options_satellite, $satellite_options);
}
$options_services = enterprise_hook('massive_services_options');
if ($options_services === ENTERPRISE_NOT_HOOK) {
$options_services = [];
}
if (in_array($option, array_keys($options_alerts)) === true) {
$tab = 'massive_alerts';
@ -136,8 +131,6 @@ if (in_array($option, array_keys($options_alerts)) === true) {
$tab = 'massive_satellite';
} else if (in_array($option, array_keys($options_plugins)) === true) {
$tab = 'massive_plugins';
} else if (in_array($option, array_keys($options_services)) === true) {
$tab = 'massive_services';
}
if ($tab === 'massive_agents' && empty($option) === true) {
@ -206,10 +199,6 @@ switch ($tab) {
$options = $options_plugins;
break;
case 'massive_services':
$options = $options_services;
break;
default:
// Default.
break;
@ -298,12 +287,6 @@ if ($satellitetab == ENTERPRISE_NOT_HOOK) {
$satellitetab = '';
}
$servicestab = enterprise_hook('massive_services_tab');
if ($servicestab == ENTERPRISE_NOT_HOOK) {
$servicestab = '';
}
$onheader = [];
$onheader['massive_agents'] = $agentstab;
$onheader['massive_modules'] = $modulestab;

1
pandora_console/godmode/menu.php
View File

@ -211,7 +211,6 @@ if ($access_console_node === true) {
enterprise_hook('massivepolicies_submenu');
enterprise_hook('massivesnmp_submenu');
enterprise_hook('massivesatellite_submenu');
enterprise_hook('massiveservices_submenu');
$sub['gmassive']['sub2'] = $sub2;
$sub2 = [];

1
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -3874,6 +3874,7 @@ $class = 'databox filters';
} else {
$rows_select = modules_get_modulegroups();
}
html_print_select($rows_select, 'modulegroup', $modulegroup, '', __($is_none), -1, true, false, true, '', false, 'width: 120px;');
html_print_select(
$rows_select,

3
pandora_console/include/functions_reporting_html.php
View File

@ -1756,7 +1756,8 @@ function reporting_html_modules_inventory($table, $item, $pdf=0)
} else if ($data_field_key === 'group_id') {
$column_value = groups_get_name($data_field_value[0]);
} else if ($data_field_key === 'sec_group_id') {
$sec_groups_names = array_map(function ($group_id) {
$sec_groups_names = array_map(
function ($group_id) {
return groups_get_name($group_id);
},
$data_field_value