Merge branch 'ent-11285-edicion-item-server-en-cualquier-informe-sql-de-metaconsola-no-funciona' into 'develop'

Ent 11285 edicion item server en cualquier informe sql de metaconsola no funciona

See merge request artica/pandorafms!5938
This commit is contained in:
Matias Didier 2023-05-25 12:53:28 +00:00
commit c53e14ee37
2 changed files with 10 additions and 5 deletions

View File

@ -1219,11 +1219,9 @@ $class = 'databox filters';
<?php <?php
html_print_select( html_print_select(
$servers, $servers,
'combo_server', 'combo_server_sql',
$server_name, $server_name,
'', ''
$nothing,
$nothing_value
); );
?> ?>
</td> </td>

View File

@ -2210,7 +2210,14 @@ switch ($action) {
); );
$values['top_n_value'] = get_parameter('max_items'); $values['top_n_value'] = get_parameter('max_items');
$values['server_name'] = get_parameter('combo_server'); if ($values['type'] === 'sql_graph_hbar'
|| ($values['type'] === 'sql_graph_vbar')
|| ($values['type'] === 'sql_graph_pie')
) {
$values['server_name'] = get_parameter('combo_server_sql');
} else {
$values['server_name'] = get_parameter('combo_server');
}
} else if ($values['type'] == 'url') { } else if ($values['type'] == 'url') {
$values['external_source'] = get_parameter('url'); $values['external_source'] = get_parameter('url');
} else if ($values['type'] == 'event_report_group') { } else if ($values['type'] == 'event_report_group') {