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-8429-eventos-duplicados-metaconsola' into 'develop' 

SQL Query modified for solve duplicate events issue

See merge request artica/pandorafms!2611
This commit is contained in:
Daniel Rodriguez 2019-07-25 10:29:31 +02:00
parent 3f90ebc938 ca19e25f74
commit 2475e6a881
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_events.php
View File

@ -1210,12 +1210,12 @@ function events_get_all(
$server_join = '';
if (is_metaconsole()) {
$server_join = ' LEFT JOIN tmetaconsole_setup ts
ON ts.id = te.server_id';
$server_join = ' INNER JOIN tmetaconsole_setup ts
ON ts.id = te.server_id AND ts.server_name = ta.server_name';
if (!empty($filter['server_id'])) {
$server_join = sprintf(
' LEFT JOIN tmetaconsole_setup ts
ON ts.id = te.server_id AND ts.id= %d',
' INNER JOIN tmetaconsole_setup ts
ON ts.id = te.server_id AND ts.server_name = ta.server_name AND ts.id= %d',
$filter['server_id']
);
}