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

mini_severity virtual column added

This commit is contained in:
fbsanchez 2019-06-24 19:23:41 +02:00
parent c85965d793
commit c1ac6b7ed6
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/events/custom_events.php
View File

@ -113,6 +113,8 @@ $fields_available['instructions'] = __('Instructions');
$fields_available['server_name'] = __('Server Name'); $fields_available['server_name'] = __('Server Name');
$fields_available['data'] = __('Data'); $fields_available['data'] = __('Data');
$fields_available['module_status'] = __('Module Status'); $fields_available['module_status'] = __('Module Status');
$fields_available['mini_severity'] = __('Severity mini');
// Remove fields already selected. // Remove fields already selected.
foreach ($fields_available as $key => $available) { foreach ($fields_available as $key => $available) {

3
pandora_console/include/functions_events.php
View File

@ -288,6 +288,9 @@ function events_get_column_name($field)
case 'options': case 'options':
return __('Options'); return __('Options');
case 'mini_severity':
return 'S';
default: default:
return __($field); return __($field);
} }

25
pandora_console/operation/events/events.php
View File

@ -209,6 +209,10 @@ if (is_ajax()) {
ob_start(); ob_start();
$order = get_datatable_order(true); $order = get_datatable_order(true);
if (is_array($order) && $order['field'] == 'mini_severity') {
$order['field'] = 'te.criticity';
}
$fields = [ $fields = [
'te.id_evento', 'te.id_evento',
'te.id_agente', 'te.id_agente',
@ -1168,6 +1172,10 @@ try {
'text' => 'evento', 'text' => 'evento',
'class' => 'mw120px', 'class' => 'mw120px',
], ],
[
'text' => 'mini_severity',
'class' => 'no-padding',
],
'id_evento', 'id_evento',
// 'id_agente', // 'id_agente',
// 'id_usuario', // 'id_usuario',
@ -1213,6 +1221,12 @@ try {
$fields = $default_fields; $fields = $default_fields;
} }
if (in_array('mini_severity', $fields) > 0) {
$fields[array_search('mini_severity', $fields)] = [
'text' => 'mini_severity',
'class' => 'no-padding-imp',
];
}
$evento_id = array_search('evento', $fields); $evento_id = array_search('evento', $fields);
if ($evento_id !== false) { if ($evento_id !== false) {
@ -1584,16 +1598,17 @@ function process_datatables_item(item) {
output += '</div>'; output += '</div>';
// Add event severity to end of text. // Add event severity to end of text.
evn = '<div class="event flex-row h100p nowrap">'; evn = '<a href="javascript:" onclick="show_event_dialog(\'';
evn += '<div><a href="javascript:" onclick="show_event_dialog(\'';
evn += btoa(JSON.stringify(item))+'\','+$("#group_rep").val()+');">'; evn += btoa(JSON.stringify(item))+'\','+$("#group_rep").val()+');">';
// Grouped events. // Grouped events.
if(item.event_rep && item.event_rep > 1) { if(item.event_rep && item.event_rep > 1) {
evn += '('+item.event_rep+') '; evn += '('+item.event_rep+') ';
} }
evn += item.evento+'</a></div>'; evn += item.evento+'</a>';
evn += output;
evn += '</div>' item.mini_severity = '<div class="event flex-row h100p nowrap">';
item.mini_severity += output;
item.mini_severity += '</div>';
criticity = '<div class="criticity" style="background: '; criticity = '<div class="criticity" style="background: ';
criticity += color + '">' + text + "</div>"; criticity += color + '">' + text + "</div>";