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

2013-03-07 Sergio Martin <sergio.martin@artica.es> 

* operation/events/events.build_table.php: Added carriage
	return support in Instructions column in events view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7803 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-03-07 08:19:24 +00:00
parent b85f460ce3
commit cb0044375a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2013-03-07 Sergio Martin <sergio.martin@artica.es>
* operation/events/events.build_table.php: Added carriage
return support in Instructions column in events view
2013-03-07 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_view_services.php,

6
pandora_console/operation/events/events.build_table.php
View File

@ -424,14 +424,14 @@ foreach ($result as $event) {
if (in_array('instructions',$show_fields)) {
switch($event['event_type']) {
case 'going_unknown':
$data[$i] = ui_print_truncate_text($event["unknown_instructions"]);
$data[$i] = ui_print_truncate_text(str_replace("\n","<br>", io_safe_output($event["unknown_instructions"])));
break;
case 'going_up_critical':
case 'going_down_critical':
$data[$i] = ui_print_truncate_text($event["critical_instructions"]);
$data[$i] = ui_print_truncate_text(str_replace("\n","<br>", io_safe_output($event["critical_instructions"])));
break;
case 'going_down_warning':
$data[$i] = ui_print_truncate_text($event["warning_instructions"]);
$data[$i] = ui_print_truncate_text(str_replace("\n","<br>", io_safe_output($event["warning_instructions"])));
break;
default:
$data[$i] = '';