Skip to content

Commit d6e88f6

Browse files
committed
#11297 Update the code to retrieve discussions on the submission list the same way it's done at the submission page
1 parent e403fcf commit d6e88f6

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

classes/services/PKPSubmissionService.inc.php

+14-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
use \PKP\Services\interfaces\EntityReadInterface;
2929
use \PKP\Services\interfaces\EntityWriteInterface;
3030
use \APP\Services\QueryBuilders\SubmissionQueryBuilder;
31+
use \QueriesAccessHelper;
3132

3233
define('STAGE_STATUS_SUBMISSION_UNASSIGNED', 1);
3334

@@ -413,13 +414,25 @@ public function getPropertyStages($submission, $stageIds = null) {
413414
// Discussions in this stage
414415
$stage['queries'] = array();
415416
$request = Application::get()->getRequest();
417+
$user = $request->getUser();
418+
import('lib.pkp.controllers.grid.queries.QueriesAccessHelper');
419+
$router = $request->getRouter();
420+
$handler = $router->getHandler();
421+
$handler->getAuthorizedContext()[ASSOC_TYPE_ACCESSIBLE_WORKFLOW_STAGES] = Services::get('user')->getAccessibleWorkflowStages(
422+
$user->getId(),
423+
$contextId,
424+
$submission,
425+
$handler->getAuthorizedContextObject(ASSOC_TYPE_USER_ROLES)
426+
);
427+
428+
$accessHelper = new QueriesAccessHelper($handler->getAuthorizedContext(), $request->getUser());
416429
import('lib.pkp.classes.query.QueryDAO');
417430
$queryDao = DAORegistry::getDAO('QueryDAO'); /* @var $queryDao QueryDAO */
418431
$queries = $queryDao->getByAssoc(
419432
ASSOC_TYPE_SUBMISSION,
420433
$submission->getId(),
421434
$stageId,
422-
$request->getUser()->getId() // Current user restriction should prevent unauthorized access
435+
$accessHelper->getCanListAll($stageId) ? null : $user->getId() // Current user restriction should prevent unauthorized access
423436
);
424437

425438
while ($query = $queries->next()) {

0 commit comments

Comments
 (0)