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

Merge branch 'develop' into ent-13345-fechas-no-se-ven-en-seccion-token-management-tema-oscuro

This commit is contained in:
Pablo Aragon 2024-04-12 09:26:06 +02:00
parent a33923786f a305d0779a
commit b5f172b42d
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2338,7 +2338,7 @@ if (is_metaconsole() === true) {
if ($idAgent) {
$sql = 'SELECT id_agente_modulo, nombre
FROM tagente_modulo
WHERE id_agente = '.$idAgent.' AND delete_pending = 0';
WHERE id_agente = "'.$idAgent["id_agent"].'" AND delete_pending = 0';
if ($meta) {
$connection = metaconsole_get_connection($server_name);

2
pandora_console/include/functions_config.php
View File

@ -1905,7 +1905,7 @@ function config_update_config()
}
break;
case 'ehorus':
case 'pandorarc':
if (config_update_value('ehorus_enabled', (int) get_parameter('ehorus_enabled', 0), true) === false) {
$error_update[] = __('Enable eHorus');
}

2
pandora_console/include/functions_menu.php
View File

@ -167,6 +167,8 @@ function menu_print_menu(&$menu)
$sec2 = 'godmode/groups/group_list';
} else if ($sec2 === 'godmode/users/configure_profile') {
$sec2 = 'godmode/users/profile_list';
} else if ($sec2 === 'godmode/users/configure_token') {
$sec2 = 'godmode/users/token_list';
} else {
$sec2 = (string) get_parameter('sec2');
}

8
pandora_console/include/functions_ui.php
View File

@ -6474,25 +6474,25 @@ function ui_print_agent_autocomplete_input($parameters)
switch (item.filter) {
default:
case \'agent\':
return $("<li style=\'background: #DFFFC4;\'></li>")
return $("<li style=\'background: #DFFFC4;\' class=\'agent-autocomplete-li-text-color\' title=\''.__('Agent').'\'></li>")
.data("item.autocomplete", item)
.append(text)
.appendTo(ul);
break;
case \'address\':
return $("<li style=\'background: #F7CFFF;\'></li>")
return $("<li style=\'background: #F7CFFF;\' class=\'agent-autocomplete-li-text-color\' title=\''.__('Address').'\'></li>")
.data("item.autocomplete", item)
.append(text)
.appendTo(ul);
break;
case \'description\':
return $("<li style=\'background: #FEFCC6;\'></li>")
return $("<li style=\'background: #FEFCC6;\' class=\'agent-autocomplete-li-text-color\' title=\''.__('Description').'\'></li>")
.data("item.autocomplete", item)
.append(text)
.appendTo(ul);
break;
case \'alias\':
return $("<li style=\"'.$background_results.'\"></li>")
return $("<li style=\"'.$background_results.'\" title=\''.__('Alias').'\'></li>")
.data("item.autocomplete", item)
.append(text)
.appendTo(ul);

4
pandora_console/include/styles/pandora_black.css
View File

@ -2070,6 +2070,10 @@ button.secondaryButton {
color: var(--text-color) !important;
}
li.agent-autocomplete-li-text-color a {
color: #333 !important;
}
/* Datepicker */
#ui-datepicker-div .ui-datepicker-header,
#ui-datepicker-div .ui-datepicker-header select option,