Skip to content
Snippets Groups Projects
Commit 05cc2f13 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FEAT #12842 TIME 1:30 update filter list when filtering on folders

parent 5fb2e3b7
No related branches found
No related tags found
No related merge requests found
......@@ -1013,6 +1013,32 @@ class ResourceListController
}
}
if (!empty($data['folders'])) {
$folders = explode(',', $data['folders']);
$resIdsInFolders = [];
foreach ($folders as $folderId) {
$resources = FolderModel::getWithResources([
'select' => ['res_id'],
'where' => ['folder_id in (?)'],
'data' => [$folderId]
]);
$resources = array_column($resources, 'res_id');
$resIdsInFolders = array_merge($resIdsInFolders, $resources);
}
if (!empty($resIdsInFolders)) {
$wherePriorities[] = 'res_id in (?)';
$dataPriorities[] = $resIdsInFolders;
$whereCategories[] = 'res_id in (?)';
$dataCategories[] = $resIdsInFolders;
$whereEntities[] = 'res_id in (?)';
$dataEntities[] = $resIdsInFolders;
$whereStatuses[] = 'res_id in (?)';
$dataStatuses[] = $resIdsInFolders;
$whereDocTypes[] = 'res_id in (?)';
$dataDocTypes[] = $resIdsInFolders;
}
}
$priorities = [];
$rawPriorities = ResModel::getOnView([
'select' => ['count(res_id)', 'priority'],
......@@ -1111,7 +1137,7 @@ class ResourceListController
$folders = [];
$resIds = ResModel::getOnView([
$resIds = ResModel::get([
'select' => ['res_id'],
'where' => $whereFolders,
'data' => $dataFolders
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment