From b807269a87cb4c286af0dc103519a7ee828db898 Mon Sep 17 00:00:00 2001 From: vgilc Date: Mon, 6 Feb 2012 11:51:14 +0000 Subject: [PATCH] 2012-02-06 Vanessa Gil * godmode/events/custom_events.php operation/events/events_list.php: Addes criticity info in event view. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/godmode/events/custom_events.php | 2 +- pandora_console/operation/events/events_list.php | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 29e2222853..28ba1c4467 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-02-06 Vanessa Gil + * godmode/events/custom_events.php + operation/events/events_list.php: Addes criticity info + in event view. + 2012-02-06 Vanessa Gil * godmode/events/custom_events.php: Added file. diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php index 24f2120ec1..b5ce8bd816 100644 --- a/pandora_console/godmode/events/custom_events.php +++ b/pandora_console/godmode/events/custom_events.php @@ -41,7 +41,7 @@ $table->data = array(); $table->data[0][0] = '

'.__('Show event fields').'

'; $table->data[1][0] = ''.__('Event ID').''; -$table->data[1][1] = __('Yes').' '.html_print_radio_button('show_id_evento', 1, '', $config['show_id_evento'], true).' '; +$table->data[1][1] = __('Yes').' '.html_print_radio_button('show_id_evento', 1, '', $config['show_id_evento'], true); $table->data[1][1] .= __('No').' '.html_print_radio_button('show_id_evento', 0, '', $config['show_id_evento'], true); $table->data[2][0] = ''.__('Event name').''; diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 507d325a99..ce99c37bec 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -892,9 +892,17 @@ foreach ($result as $event) { $string .= ','; } $string = rtrim($string, ','); + $odd = ($odd == '')? 'rowOdd' : ''; } else { $string .= '- ' . __('Empty') . ' -'; + $odd = ($odd == '')? 'rowOdd' : ''; + } + if ($event["criticity"] != '') { + $string .= '' . '' . __('Criticity') . ''; + $string .= $event["criticity"]; + $string .= ''; + $odd = ($odd == '')? 'rowOdd' : ''; } $string .= ''; $string .= '';