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-12706-error-visual-en-agrupacion-de-eventos' into 'develop' 

Ent 12706 Error visual en agrupacion de eventos.

See merge request artica/pandorafms!6812
This commit is contained in:
Rafael Ameijeiras 2023-12-27 09:04:42 +00:00
parent 45491f43ab bb92202ba2
commit c7d34b1308
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/styles/events.css
View File

@ -108,7 +108,7 @@ td > input[id^="checkbox-multi"] {
height: 2.5em;
}
.info_table.events tr > td span:not(.invisible) {
.info_table.events tr:not(.group) > td span:not(.invisible) {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;

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

@ -1167,7 +1167,7 @@ if (is_ajax() === true) {
parse_str($url_link_hash, $url_hash_array);
$redirection_form = "<form id='agent-table-redirection-".$redirection_form_id."' method='POST' action='".$url_link.$tmp->id_agente."'>";
$redirection_form = "<form id='agent-table-redirection-".$redirection_form_id."' class='invisible' method='POST' action='".$url_link.$tmp->id_agente."'>";
$redirection_form .= html_print_input_hidden(
'loginhash',
$url_hash_array['loginhash'],
@ -3080,7 +3080,10 @@ function process_datatables_callback(table, settings) {
.data()
.each( function ( group, i ) {
$(rows).eq( i ).show();
if ( last !== group ) {
// Compare only "a" tag because in metaconsole the node has "form".
let last_to_compare = $(last).filter('a').html();
let group_to_compare = $(group).filter('a').html();
if ( last_to_compare !== group_to_compare ) {
$(rows).eq( i ).before(
'<tr class="group"><td colspan="100%">'
+'<?php echo __('Agent').' '; ?>'