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

Merge branch 'fixed-csv-export-events-secondary-groups' into 'develop' 

[Events] Fixed csv export after secondary groups

See merge request artica/pandorafms!1459
This commit is contained in:
vgilc 2018-04-30 12:47:53 +02:00
parent 235f20ef86 57c928ec8a
commit 1fdb90f075
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/operation/events/export_csv.php
View File

@ -87,7 +87,9 @@ switch ($config["dbtype"]) {
case "postgresql": case "postgresql":
case "oracle": case "oracle":
$sql = "SELECT * $sql = "SELECT *
FROM tevento FROM tevento te
LEFT JOIN tagent_secondary_group tasg
ON te.id_grupo = tasg.id_group
WHERE 1=1 ".$sql_post." WHERE 1=1 ".$sql_post."
ORDER BY utimestamp DESC"; ORDER BY utimestamp DESC";
break; break;