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

Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop' 

Fixed agent name and error lenght

See merge request artica/pandorafms!2845
This commit is contained in:
Daniel Rodriguez 2019-11-06 13:14:06 +01:00
parent 37ffff12eb 8573add0b3
commit d460429509
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1539,7 +1539,7 @@ function process_datatables_callback(table, settings) {
// Agent id. // Agent id.
target = i; target = i;
} }
if(label == '<?php echo __('Agent name'); ?>') { if(label == '<?php echo addslashes(__('Agent name')); ?>') {
// Agent id. // Agent id.
target = i; target = i;
break; break;
@ -1620,12 +1620,10 @@ function process_datatables_item(item) {
// Show comments events. // Show comments events.
item.user_comment = item.comments item.user_comment = item.comments
if(item.comments.length > 80){ if(typeof item.comments !== 'undefined' && item.comments.length > 80) {
item.user_comment += '&nbsp;&nbsp;<a id="show_comments" href="javascript:" onclick="show_event_dialog(\''; item.user_comment += '&nbsp;&nbsp;<a id="show_comments" href="javascript:" onclick="show_event_dialog(\'';
item.user_comment += item.b64+"','comments'," + $("#group_rep").val()+');">'; item.user_comment += item.b64+"','comments'," + $("#group_rep").val()+');">';
item.user_comment += '<?php echo html_print_image('images/eye.png', true, ['title' => __('Show more')]); ?></a>'; item.user_comment += '<?php echo html_print_image('images/eye.png', true, ['title' => __('Show more')]); ?></a>';
} }
// Grouped events. // Grouped events.