tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4109-Bug-en-utilizacion-de-macro-en-report-a-traves-de-plantillas' into 'develop'

Browse Source 
fix item name macros when using report templates

See merge request artica/pandorafms!2570
This commit is contained in:
Daniel Rodriguez 2019-07-08 17:13:13 +02:00
commit e43469954a
2 changed files with 444 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_agents.php
View File

@ -1531,7 +1531,7 @@ function agents_get_alias($id_agent, $case='none')
return $cache[$case][$id_agent]; return $cache[$case][$id_agent];
} }
if ($config['dbconnection_cache'] == null && is_metaconsole()) { if (is_metaconsole()) {
$alias = (string) db_get_value('alias', 'tmetaconsole_agent', 'id_tagente', (int) $id_agent); $alias = (string) db_get_value('alias', 'tmetaconsole_agent', 'id_tagente', (int) $id_agent);
} else { } else {
$alias = (string) db_get_value('alias', 'tagente', 'id_agente', (int) $id_agent); $alias = (string) db_get_value('alias', 'tagente', 'id_agente', (int) $id_agent);

831
pandora_console/include/functions_reporting.php
View File

File diff suppressed because it is too large Load Diff