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

#12168 Fixed sql bringing main services

Browse Source
This commit is contained in:
Jorge Rincon 2023-11-13 13:41:47 +01:00
parent 13ba9aff39
commit 04649dee00
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/class/TreeService.class.php
View File

@ -738,19 +738,15 @@ class TreeService extends Tree
$filterResult = db_get_all_rows_sql($sqlFilter); $filterResult = db_get_all_rows_sql($sqlFilter);
$services = [];
foreach ($filterResult as $key => $result) { foreach ($filterResult as $key => $result) {
$ancestors = services_get_services_ancestors($result['id']); $services_ancestors = services_get_services_ancestors($result['id']);
$idAncestors = implode(',', $ancestors); $services[] = array_pop($services_ancestors);
$numAncestors = count($ancestors);
if ($numAncestors > 1) {
$whereAncestors = ' AND tse.id_service_child in ('.$idAncestors.')';
} else if ($numAncestors == 1) {
$whereAncestors = ' AND ts.id ='.$idAncestors;
} else {
$whereAncestors = ' AND ts.id ='.$result['id'];
}
} }
$services_list = array_unique($services, SORT_NUMERIC);
$whereAncestors = ' AND tse.id_service IN ('.implode(',', $services_list).')';
return $whereAncestors; return $whereAncestors;
} }

1
pandora_console/include/javascript/tree/TreeController.js
View File

@ -1561,6 +1561,7 @@ var TreeController = {
* Filter the tree based on a search criterion * Filter the tree based on a search criterion
*/ */
function _filterItems(rawTree, searched) { function _filterItems(rawTree, searched) {
console.log(rawTree);
const ancestors = []; const ancestors = [];
const father = []; const father = [];
const newTree = []; const newTree = [];