From 8dea19960803f8b55ac5d530e0dfd2f3c6e46bcc Mon Sep 17 00:00:00 2001 From: Hafsa-Naeem Date: Thu, 12 Sep 2024 10:25:22 +0500 Subject: [PATCH 1/2] pkp/pkp-lib#10090 Ensure anonymity in discussions for double-blind review --- controllers/grid/queries/form/QueryForm.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/controllers/grid/queries/form/QueryForm.php b/controllers/grid/queries/form/QueryForm.php index 03a64eced8d..9d0e15963f1 100644 --- a/controllers/grid/queries/form/QueryForm.php +++ b/controllers/grid/queries/form/QueryForm.php @@ -319,13 +319,11 @@ public function fetch($request, $template = null, $display = false, $actionArgs // if current user is an anonymous reviewer, filter out authors foreach ($reviewAssignments as $reviewAssignment) { if ($reviewAssignment->getReviewerId() == $user->getId()) { - if ($reviewAssignment->getReviewMethod() != ReviewAssignment::SUBMISSION_REVIEW_METHOD_OPEN) { - // Replaces StageAssignmentDAO::getBySubmissionAndRoleId + if ($reviewAssignment->getReviewMethod() == ReviewAssignment::SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS ) { + // exclude authors from the list of participants to ensure anonymity $excludeUsers = StageAssignment::withSubmissionIds([$query->getAssocId()]) ->withRoleIds([Role::ROLE_ID_AUTHOR]) - ->withUserId($user->getId()) - ->get() - ->pluck('userId') + ->pluck('user_id') ->all(); } } From 61f1e0cbe23e5ad83681b24450580584c81f71fa Mon Sep 17 00:00:00 2001 From: Hafsa-Naeem Date: Mon, 23 Sep 2024 17:45:37 +0500 Subject: [PATCH 2/2] pkp/pkp-lib#10090 Avoid usage of column name outside of a query builder --- controllers/grid/queries/form/QueryForm.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/grid/queries/form/QueryForm.php b/controllers/grid/queries/form/QueryForm.php index 9d0e15963f1..7aa58c83d99 100644 --- a/controllers/grid/queries/form/QueryForm.php +++ b/controllers/grid/queries/form/QueryForm.php @@ -323,7 +323,9 @@ public function fetch($request, $template = null, $display = false, $actionArgs // exclude authors from the list of participants to ensure anonymity $excludeUsers = StageAssignment::withSubmissionIds([$query->getAssocId()]) ->withRoleIds([Role::ROLE_ID_AUTHOR]) - ->pluck('user_id') + ->withUserId($user->getId()) + ->get() + ->pluck('userId') ->all(); } }