From 0de8a8335bdcd5fd5711a660f29feb3ac7034cd5 Mon Sep 17 00:00:00 2001 From: vgilc Date: Wed, 8 Feb 2012 17:56:32 +0000 Subject: [PATCH] 2012-02-08 Vanessa Gil * godmode/events/custom_events.php: Added default fields button. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5523 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 3 +++ .../godmode/events/custom_events.php | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5dc94a28a2..cdf7c01223 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,6 @@ +2012-02-08 Vanessa Gil + * godmode/events/custom_events.php: Added default fields button. + 2012-02-08 Vanessa Gil * pandoradb.sql pandoradb.postgreSQL.sql diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php index d7841fe983..0fd99877c4 100644 --- a/pandora_console/godmode/events/custom_events.php +++ b/pandora_console/godmode/events/custom_events.php @@ -25,13 +25,18 @@ if (! check_acl($config['id_user'], 0, "PM")) { return; } - $update = get_parameter('update_config', 0); +$default = get_parameter('default', 0); $fields_selected = array(); $event_fields = ''; $fields_selected = explode (',', $config['event_fields']); +if ($default) { + $event_fields = io_safe_input('evento,id_agente,estado,timestamp'); + $fields_selected = explode (',', $event_fields); +} + if ($update) { $fields_selected = (array)get_parameter('fields_selected'); @@ -52,6 +57,7 @@ if ($update) { $result_selected = array(); +//show list of fields selected. if ($fields_selected[0]!='') { foreach ($fields_selected as $field_selected) { switch ($field_selected) { @@ -86,7 +92,7 @@ if ($fields_selected[0]!='') { $result = __('Alert'); break; case 'criticity': - $result = __('Criticity id'); + $result = __('Criticity'); break; case 'user_comment': $result = __('Comment'); @@ -101,7 +107,6 @@ if ($fields_selected[0]!='') { $result = __('Extra id'); break; } - $result_selected[$field_selected] = $result; } } @@ -136,7 +141,6 @@ $fields_available['tags'] = __('Tags'); $fields_available['source'] = __('Source'); $fields_available['id_extra'] = __('Extra id'); - //remove fields already selected foreach ($fields_available as $key=>$available) { foreach ($result_selected as $selected) { @@ -161,7 +165,11 @@ html_print_table($table); echo '
'; html_print_input_hidden ('update_config', 1); html_print_submit_button (__('Update'), 'upd_button', false, 'class="sub upd"'); - echo ''; +echo ''; +echo '
'; + html_print_input_hidden ('default', 1); + html_print_submit_button (__('Default fields'), 'default_fields', false, 'class="sub upd"'); +echo '
'; echo '
'; ?>