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-13629-17432-500-en-el-item-sql-query-informes' into 'develop' 

Ent 13629 17432 500 en el item sql query informes

See merge request artica/pandorafms!7258
This commit is contained in:
Carlos Pozuelo 2024-04-23 09:55:29 +00:00
parent aa307b4229 bc7b28b095
commit cf8995d48b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -2426,7 +2426,7 @@ 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_sql'); $values['server_name'] = get_parameter('combo_server_sql');
if ($sql !== '') { if ($sql !== '' && $sql !== null) {
// Replaces possible macros to check the validity of the query // Replaces possible macros to check the validity of the query
$macros_sql = $sql; $macros_sql = $sql;
$macros_sql = str_replace('_start_date_', '0', $macros_sql); $macros_sql = str_replace('_start_date_', '0', $macros_sql);
@ -3376,7 +3376,7 @@ switch ($action) {
$values['server_name'] = get_parameter('combo_server_sql'); $values['server_name'] = get_parameter('combo_server_sql');
if ($sql !== '') { if ($sql !== '' && $sql !== null) {
// Replaces possible macros to check the validity of the query // Replaces possible macros to check the validity of the query
$macros_sql = $sql; $macros_sql = $sql;
$macros_sql = str_replace('_start_date_', '0', $macros_sql); $macros_sql = str_replace('_start_date_', '0', $macros_sql);