From 87fdb6cad4101127ee8e6ee37a37fb85c0ac2500 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Thu, 20 Feb 2020 11:02:26 +0100
Subject: [PATCH] FEAT #13243 TIME 0:10 added keyword folders to resource
hasRight
---
src/app/resource/controllers/ResController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 3abdb91464d..683c1c45988 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -920,7 +920,7 @@ class ResController extends ResourceControlController
$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 .= '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})";
$groups = UserModel::getGroupsByLogin(['login' => $user['user_id'], 'select' => ['where_clause']]);
--
GitLab