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

2013-09-04 Ramon Novoa <rnovoa@artica.es> 

* include/functions_events.php,
	  include/javascript/pandora_events.js: Added 'ID extra' to the event
	  details.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2013-09-04 09:14:52 +00:00
parent 3da5f64882
commit eed5d0efb4
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-09-04 Ramon Novoa <rnovoa@artica.es>
* include/functions_events.php,
include/javascript/pandora_events.js: Added 'ID extra' to the event
details.
2013-09-03 Miguel de Dios <miguel.dedios@artica.es> 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php, operation/agentes/group_view.php: * include/functions_groups.php, operation/agentes/group_view.php:

10
pandora_console/include/functions_events.php
View File

@ -2250,6 +2250,16 @@ function events_page_general ($event) {
} }
$table_general->data[] = $data; $table_general->data[] = $data;
$data = array();
$data[0] = __('ID extra');
if ($event["id_extra"] != '') {
$data[1] = $event["id_extra"];
}
else {
$data[1] = '<i>' . __('N/A') . '</i>';
}
$table_general->data[] = $data;
$general = '<div id="extended_event_general_page" class="extended_event_pages">'.html_print_table($table_general,true).'</div>'; $general = '<div id="extended_event_general_page" class="extended_event_pages">'.html_print_table($table_general,true).'</div>';
return $general; return $general;

2
pandora_console/include/javascript/pandora_events.js
View File

@ -47,7 +47,7 @@ function show_event_dialog(event_id, group_rep, dialog_page, result) {
background: "black" background: "black"
}, },
width: 700, width: 700,
height: 500 height: 510
}) })
.show (); .show ();