From a66cc6afccc560b371c5b21c9300e55257c8da2e Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 13 Jan 2020 14:42:57 +0100
Subject: [PATCH] FEAT #12091 TIME 2:00 added followed resources in search
scope
---
core/class/class_request.php | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/core/class/class_request.php b/core/class/class_request.php
index 5894c30fa33..aeff183ec01 100755
--- a/core/class/class_request.php
+++ b/core/class/class_request.php
@@ -137,8 +137,15 @@ where
where users_entities.user_id = :user_id_folders
)";
- $where_string = ''.$where_string." and ( ".$_SESSION['user']['security'][$coll]['DOC']['where']." or res_id in (".$whereFolders.")) ";
- $parameters = array_merge($parameters, array(":user_id_folders" => $_SESSION['user']['UserId']));
+ $whereFollowed = "select res_id from users_followed_resources where user_id = :user_id_followed";
+
+ $user = \User\models\UserModel::getByLogin(['login' => $_SESSION['user']['UserId'], 'select' => ['id']]);
+
+ $where_string = ''.$where_string." and ( ".$_SESSION['user']['security'][$coll]['DOC']['where']." or res_id in (".$whereFolders.") or res_id in (".$whereFollowed.")) ";
+ $parameters = array_merge($parameters, [
+ "user_id_folders" => $_SESSION['user']['UserId'],
+ "user_id_followed" => $user['id']
+ ]);
}
break;
--
GitLab