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

Merge branch 'ent-13604-selector-severity-priority-tiene-opciones-compuestas' into 'develop'

Browse Source 
Ent 13604 selector severity priority tiene opciones compuestas

See merge request artica/pandorafms!7342
This commit is contained in:
Matias Didier 2024-05-16 16:36:03 +00:00
commit b78e58d13c
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -143,7 +143,7 @@ $form_filter .= '<td class="w33p">'.html_print_label_input_block(
).'</td>'; ).'</td>';
$form_filter .= '<td class="w33p">'.html_print_label_input_block( $form_filter .= '<td class="w33p">'.html_print_label_input_block(
__('Priority'), __('Severity'),
html_print_select( html_print_select(
get_priorities(), get_priorities(),
'priority', 'priority',

2
pandora_console/godmode/alerts/alert_view.php
View File

@ -127,7 +127,7 @@ $table_details->data[] = $data;
$priorities = get_priorities(); $priorities = get_priorities();
$data[0] = __('Priority'); $data[0] = __('Severity');
$data[1] = '<span title="'.$priorities[$template['priority']].'" class="'.get_priority_class($template['priority']).' span_priority">&nbsp</span>'.$priorities[$template['priority']]; $data[1] = '<span title="'.$priorities[$template['priority']].'" class="'.get_priority_class($template['priority']).' span_priority">&nbsp</span>'.$priorities[$template['priority']];
$table_details->data[] = $data; $table_details->data[] = $data;

4
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -1235,9 +1235,9 @@ if ($step == 2) {
); );
$table->data[2][0] = html_print_label_input_block( $table->data[2][0] = html_print_label_input_block(
__('Priority'), __('Severity'),
html_print_select( html_print_select(
get_priorities(), get_priorities(false, true),
'priority', 'priority',
$priority, $priority,
'', '',

6
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -1614,9 +1614,9 @@ if ($create_alert || $update_alert) {
echo '</td>'; echo '</td>';
echo '<td class="w50p">'; echo '<td class="w50p">';
echo html_print_label_input_block( echo html_print_label_input_block(
__('Priority'), __('Severity'),
html_print_select( html_print_select(
get_priorities(), get_priorities(false, true),
'priority', 'priority',
$priority, $priority,
'', '',
@ -1776,7 +1776,7 @@ if ($create_alert || $update_alert) {
); );
$table_filter->data[0][2] = html_print_label_input_block( $table_filter->data[0][2] = html_print_label_input_block(
__('Priority'), __('Severity'),
html_print_select( html_print_select(
get_priorities(), get_priorities(),
'priority_filter', 'priority_filter',

9
pandora_console/include/functions.php
View File

@ -1404,7 +1404,7 @@ function get_event_types($id_type=false)
* *
* @return array An array with all the priorities. * @return array An array with all the priorities.
*/ */
function get_priorities($priority_param=false) function get_priorities($priority_param=false, $creation=false)
{ {
global $config; global $config;
@ -1416,9 +1416,12 @@ function get_priorities($priority_param=false)
$priorities[EVENT_CRIT_WARNING] = __('Warning'); $priorities[EVENT_CRIT_WARNING] = __('Warning');
$priorities[EVENT_CRIT_MAJOR] = __('Major'); $priorities[EVENT_CRIT_MAJOR] = __('Major');
$priorities[EVENT_CRIT_CRITICAL] = __('Critical'); $priorities[EVENT_CRIT_CRITICAL] = __('Critical');
$priorities[EVENT_CRIT_WARNING_OR_CRITICAL] = __('Warning').'/'.__('Critical');
$priorities[EVENT_CRIT_NOT_NORMAL] = __('Not normal'); $priorities[EVENT_CRIT_NOT_NORMAL] = __('Not normal');
$priorities[EVENT_CRIT_OR_NORMAL] = __('Critical').'/'.__('Normal');
if ($creation === false) {
$priorities[EVENT_CRIT_WARNING_OR_CRITICAL] = __('Warning').'/'.__('Critical');
$priorities[EVENT_CRIT_OR_NORMAL] = __('Critical').'/'.__('Normal');
}
foreach ($priorities as $key => $priority) { foreach ($priorities as $key => $priority) {
$priorities[$key] = ui_print_truncate_text($priority, GENERIC_SIZE_TEXT, false, true, false); $priorities[$key] = ui_print_truncate_text($priority, GENERIC_SIZE_TEXT, false, true, false);