tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4565-No-funciona-el-filtro-de-servidor-en-la-vista-de-eventos-de-la-metaconsola' into 'develop'

Browse Source 
Fixed bug in metaconsole filter events

See merge request artica/pandorafms!2683
This commit is contained in:
Alejandro Fraguas 2019-08-28 09:20:18 +02:00
commit 21712c5c23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_events.php
View File

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

2
pandora_console/operation/events/events.php
View File

@ -984,7 +984,7 @@ if (is_metaconsole()) {
'SELECT id, server_name FROM tmetaconsole_setup', 'SELECT id, server_name FROM tmetaconsole_setup',
'server_id', 'server_id',
$server_id, $server_id,
'script', '',
__('All'), __('All'),
'0', '0',
true true