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-4200-visual-console-omnipresent-group-summary' into 'develop' 

Fixed the omnipresent group summary bug

See merge request artica/pandorafms!2496
This commit is contained in:
Alejandro Fraguas 2019-06-13 13:25:50 +02:00
parent fef1441d9f 8793e2debd
commit beea6941e5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/rest-api/models/VisualConsole/Container.php
View File

@ -319,7 +319,7 @@ final class Container extends Model
// Default filter. // Default filter.
$filter = ['id_layout' => $layoutId]; $filter = ['id_layout' => $layoutId];
$fields = [ $fields = [
'id', 'DISTINCT(id) AS id',
'type', 'type',
'cache_expiration', 'cache_expiration',
'id_layout', 'id_layout',
@ -340,8 +340,9 @@ final class Container extends Model
// Only true condition if type is GROUP_ITEM. // Only true condition if type is GROUP_ITEM.
$filter[] = '('.\db_format_array_where_clause_sql( $filter[] = '('.\db_format_array_where_clause_sql(
[ [
'type' => GROUP_ITEM, 'id_layout' => $layoutId,
'id_group' => $groupsFilter, 'type' => GROUP_ITEM,
'id_group' => $groupsFilter,
] ]
).')'; ).')';
} }