Merge branch 'ent-9047-vista-de-auditoria-mejoras-funcionales-y-esteticas' into 'develop'
Ent 9047 vista de auditoria mejoras funcionales y esteticas See merge request artica/pandorafms!5500
This commit is contained in:
commit
9def6eb6d5
|
@ -96,7 +96,10 @@ class AuditLog extends HTML
|
||||||
// Datatables list.
|
// Datatables list.
|
||||||
try {
|
try {
|
||||||
$columns = [
|
$columns = [
|
||||||
'id_usuario',
|
[
|
||||||
|
'text' => 'id_usuario',
|
||||||
|
'class' => 'w50px',
|
||||||
|
],
|
||||||
'accion',
|
'accion',
|
||||||
'fecha',
|
'fecha',
|
||||||
'ip_origen',
|
'ip_origen',
|
||||||
|
@ -116,11 +119,11 @@ class AuditLog extends HTML
|
||||||
$columns,
|
$columns,
|
||||||
[
|
[
|
||||||
'text' => 'security',
|
'text' => 'security',
|
||||||
'class' => 'w80px action_buttons show_security_info',
|
'class' => 'w50px action_buttons show_security_info',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'text' => 'action',
|
'text' => 'action',
|
||||||
'class' => 'w80px action_buttons show_extended_info',
|
'class' => 'w50px action_buttons show_extended_info',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -199,14 +202,26 @@ class AuditLog extends HTML
|
||||||
[
|
[
|
||||||
'label' => __('Free search').ui_print_help_tip(__('Search filter by User, Action, Date, Source IP or Comments fields content'), true),
|
'label' => __('Free search').ui_print_help_tip(__('Search filter by User, Action, Date, Source IP or Comments fields content'), true),
|
||||||
'type' => 'text',
|
'type' => 'text',
|
||||||
'class' => 'w200px',
|
'class' => 'w150px',
|
||||||
'id' => 'filter_text',
|
'id' => 'filter_text',
|
||||||
'name' => 'filter_text',
|
'name' => 'filter_text',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'label' => __('Max. hours old'),
|
'label' => __('Max. hours old'),
|
||||||
'type' => 'text',
|
'type' => 'select',
|
||||||
'class' => 'w100px',
|
'class' => 'w20px',
|
||||||
|
'select2_enable' => true,
|
||||||
|
'sort' => false,
|
||||||
|
'selected' => 168,
|
||||||
|
'fields' => [
|
||||||
|
24 => __('1 day'),
|
||||||
|
168 => __('7 days'),
|
||||||
|
360 => __('15 days'),
|
||||||
|
744 => __('1 month'),
|
||||||
|
2160 => __('3 months'),
|
||||||
|
4320 => __('6 months'),
|
||||||
|
8760 => __('1 Year'),
|
||||||
|
],
|
||||||
'id' => 'filter_period',
|
'id' => 'filter_period',
|
||||||
'name' => 'filter_period',
|
'name' => 'filter_period',
|
||||||
],
|
],
|
||||||
|
@ -223,7 +238,7 @@ class AuditLog extends HTML
|
||||||
'nothing' => __('All'),
|
'nothing' => __('All'),
|
||||||
'nothing_value' => '-1',
|
'nothing_value' => '-1',
|
||||||
'sql' => 'SELECT DISTINCT(accion), accion AS text FROM tsesion',
|
'sql' => 'SELECT DISTINCT(accion), accion AS text FROM tsesion',
|
||||||
'class' => 'mw250px',
|
'class' => 'mw200px',
|
||||||
'id' => 'filter_type',
|
'id' => 'filter_type',
|
||||||
'name' => 'filter_type',
|
'name' => 'filter_type',
|
||||||
],
|
],
|
||||||
|
@ -235,7 +250,7 @@ class AuditLog extends HTML
|
||||||
'sql' => 'SELECT id_user, id_user AS text FROM tusuario UNION SELECT "SYSTEM"
|
'sql' => 'SELECT id_user, id_user AS text FROM tusuario UNION SELECT "SYSTEM"
|
||||||
AS id_user, "SYSTEM" AS text UNION SELECT "N/A"
|
AS id_user, "SYSTEM" AS text UNION SELECT "N/A"
|
||||||
AS id_user, "N/A" AS text',
|
AS id_user, "N/A" AS text',
|
||||||
'class' => 'mw250px',
|
'class' => 'mw200px',
|
||||||
'id' => 'filter_user',
|
'id' => 'filter_user',
|
||||||
'name' => 'filter_user',
|
'name' => 'filter_user',
|
||||||
],
|
],
|
||||||
|
@ -346,9 +361,12 @@ class AuditLog extends HTML
|
||||||
).ui_print_timestamp($tmp->utimestamp, true);
|
).ui_print_timestamp($tmp->utimestamp, true);
|
||||||
|
|
||||||
if (enterprise_installed() === true) {
|
if (enterprise_installed() === true) {
|
||||||
|
$extendedInfo = enterprise_hook('rowEnterpriseAudit', [$tmp->id_sesion]);
|
||||||
|
if (empty($extendedInfo) === false) {
|
||||||
$tmp->security = enterprise_hook('cell1EntepriseAudit', [$tmp->id_sesion]);
|
$tmp->security = enterprise_hook('cell1EntepriseAudit', [$tmp->id_sesion]);
|
||||||
$tmp->action = enterprise_hook('cell2EntepriseAudit', []);
|
$tmp->action = enterprise_hook('cell2EntepriseAudit', []);
|
||||||
$tmp->extendedInfo = enterprise_hook('rowEnterpriseAudit', [$tmp->id_sesion]);
|
$tmp->extendedInfo = $extendedInfo;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$carry[] = $tmp;
|
$carry[] = $tmp;
|
||||||
|
|
Loading…
Reference in New Issue