Merge branch 'ent-4565-No-funciona-el-filtro-de-servidor-en-la-vista-de-eventos-de-la-metaconsola' into 'develop'
Fixed bug in metaconsole filter events See merge request artica/pandorafms!2683
This commit is contained in:
commit
21712c5c23
|
@ -1220,7 +1220,7 @@ function events_get_all(
|
|||
ON ts.id = te.server_id';
|
||||
if (!empty($filter['server_id'])) {
|
||||
$server_join = sprintf(
|
||||
' LEFT JOIN tmetaconsole_setup ts
|
||||
' INNER JOIN tmetaconsole_setup ts
|
||||
ON ts.id = te.server_id AND ts.id= %d',
|
||||
$filter['server_id']
|
||||
);
|
||||
|
|
|
@ -984,7 +984,7 @@ if (is_metaconsole()) {
|
|||
'SELECT id, server_name FROM tmetaconsole_setup',
|
||||
'server_id',
|
||||
$server_id,
|
||||
'script',
|
||||
'',
|
||||
__('All'),
|
||||
'0',
|
||||
true
|
||||
|
|
Loading…
Reference in New Issue