tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix alert details pandora_enterprise#12423

Browse Source
This commit is contained in:
daniel 2023-11-08 12:49:45 +01:00
parent c81b42cc95
commit 9ccb6a98c6
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pandora_console/operation/agentes/alerts_status.functions.php
View File

@ -56,8 +56,18 @@ function validateAlert($ids)
} }
function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false, $tag_filter=false, $action_filter=false, $return=false, $strict_user=false, $access='AR') function printFormFilterAlert(
{ $id_group,
$filter,
$free_search,
$alert_agent_view,
$filter_standby=false,
$tag_filter=false,
$action_filter=false,
$return=false,
$strict_user=false,
$access='AR'
) {
global $config; global $config;
include_once $config['homedir'].'/include/functions_tags.php'; include_once $config['homedir'].'/include/functions_tags.php';
@ -70,6 +80,32 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
$table->size[2] = '33%'; $table->size[2] = '33%';
$table->data = []; $table->data = [];
if ($alert_agent_view === false) {
$table->data[0][0] = html_print_label_input_block(
__('Group'),
html_print_select_groups(
$config['id_user'],
$access,
true,
'ag_group',
$id_group,
'',
'',
'',
true,
false,
false,
'',
false,
'',
false,
false,
'id_grupo',
$strict_user
)
);
}
$alert_status_filter = []; $alert_status_filter = [];
$alert_status_filter['all_enabled'] = __('All (Enabled)'); $alert_status_filter['all_enabled'] = __('All (Enabled)');
$alert_status_filter['all'] = __('All'); $alert_status_filter['all'] = __('All');
@ -81,7 +117,7 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
$alert_standby['1'] = __('Standby on'); $alert_standby['1'] = __('Standby on');
$alert_standby['0'] = __('Standby off'); $alert_standby['0'] = __('Standby off');
$table->data[0][0] = html_print_label_input_block( $table->data[0][1] = html_print_label_input_block(
__('Status'), __('Status'),
html_print_select( html_print_select(
$alert_status_filter, $alert_status_filter,
@ -119,12 +155,12 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
); );
} }
$table->data[0][1] = html_print_label_input_block( $table->data[0][2] = html_print_label_input_block(
__('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true), __('Tags').ui_print_help_tip(__('Only it is show tags in use.'), true),
$callbackTag $callbackTag
); );
$table->data[0][2] = html_print_label_input_block( $table->data[1][0] = html_print_label_input_block(
__('Free text for search').ui_print_help_tip( __('Free text for search').ui_print_help_tip(
__('Filter by agent name, module name, template name or action name'), __('Filter by agent name, module name, template name or action name'),
true true
@ -132,7 +168,7 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
html_print_input_text('free_search', $free_search, '', 20, 40, true) html_print_input_text('free_search', $free_search, '', 20, 40, true)
); );
$table->data[1][0] = html_print_label_input_block( $table->data[1][1] = html_print_label_input_block(
__('Standby'), __('Standby'),
html_print_select( html_print_select(
$alert_standby, $alert_standby,
@ -151,7 +187,7 @@ function printFormFilterAlert($filter, $free_search, $url, $filter_standby=false
); );
$alert_action = alerts_get_alert_actions_filter(); $alert_action = alerts_get_alert_actions_filter();
$table->data[1][1] = html_print_label_input_block( $table->data[1][2] = html_print_label_input_block(
__('Action'), __('Action'),
html_print_select( html_print_select(
$alert_action, $alert_action,

11
pandora_console/operation/agentes/alerts_status.php
View File

@ -405,6 +405,12 @@ if ($agent_view_page === true) {
] ]
); );
} else { } else {
$tab = get_parameter('tab', 'main');
$alert_agent_view = false;
if ($tab == 'alert') {
$alert_agent_view = true;
}
ui_print_datatable( ui_print_datatable(
[ [
'id' => 'alerts_status_datatable', 'id' => 'alerts_status_datatable',
@ -430,9 +436,10 @@ if ($agent_view_page === true) {
'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar', 'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar',
'form' => [ 'form' => [
'html' => printFormFilterAlert( 'html' => printFormFilterAlert(
$id_group,
$disabled, $disabled,
$free_search, $free_search,
$url, $alert_agent_view,
$filter_standby, $filter_standby,
$tag_filter, $tag_filter,
true, true,
@ -440,7 +447,7 @@ if ($agent_view_page === true) {
$strict_user $strict_user
), ),
], ],
'start_disabled' => true, 'start_disabled' => !$alert_agent_view,
] ]
); );
} }