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

FEAT #13243 TIME 0:10 added keyword folders to resource hasRight

parent 7b267da5
No related branches found
No related tags found
No related merge requests found
...@@ -920,7 +920,7 @@ class ResController extends ResourceControlController ...@@ -920,7 +920,7 @@ class ResController extends ResourceControlController
$entities = array_column($entities, 'id'); $entities = array_column($entities, 'id');
$foldersClause = 'res_id in (select res_id from folders LEFT JOIN entities_folders ON folders.id = entities_folders.folder_id LEFT JOIN resources_folders ON folders.id = resources_folders.folder_id '; $foldersClause = 'res_id in (select res_id from folders LEFT JOIN entities_folders ON folders.id = entities_folders.folder_id LEFT JOIN resources_folders ON folders.id = resources_folders.folder_id ';
$foldersClause .= 'WHERE entities_folders.entity_id in (?) OR folders.user_id = ?)'; $foldersClause .= "WHERE entities_folders.entity_id in (?) OR folders.user_id = ? OR keyword = 'ALL_ENTITIES')";
$whereClause .= " OR ({$foldersClause})"; $whereClause .= " OR ({$foldersClause})";
$groups = UserModel::getGroupsByLogin(['login' => $user['user_id'], 'select' => ['where_clause']]); $groups = UserModel::getGroupsByLogin(['login' => $user['user_id'], 'select' => ['where_clause']]);
......
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