Skip to content

Commit d804310

Browse files
Gets disabled users in OPS too
Issue: documentacao-e-tarefas/scielo#885 Signed-off-by: Jhon <jhon@lepidus.com.br>
1 parent 1e6fcb4 commit d804310

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

classes/ScieloPreprintsDAO.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,11 @@ public function getSectionModerators($submissionId): array
7575
$stageAssignmentsResults = $stageAssignmentDao->getBySubmissionAndRoleId($submissionId, ROLE_ID_SUB_EDITOR, self::SUBMISSION_STAGE_ID);
7676

7777
while ($stageAssignment = $stageAssignmentsResults->next()) {
78-
$user = Repo::user()->get($stageAssignment->getUserId(), false);
78+
$user = Repo::user()->get($stageAssignment->getUserId(), true);
79+
if (is_null($user)) {
80+
continue;
81+
}
82+
7983
$userGroup = Repo::userGroup()->get($stageAssignment->getUserGroupId());
8084
$currentUserGroupAbbrev = strtolower($userGroup->getData('abbrev', 'en'));
8185

@@ -94,7 +98,11 @@ public function getResponsibles($submissionId): array
9498
$stageAssignmentsResults = $stageAssignmentDao->getBySubmissionAndRoleId($submissionId, ROLE_ID_SUB_EDITOR, self::SUBMISSION_STAGE_ID);
9599

96100
while ($stageAssignment = $stageAssignmentsResults->next()) {
97-
$user = Repo::user()->get($stageAssignment->getUserId(), false);
101+
$user = Repo::user()->get($stageAssignment->getUserId(), true);
102+
if (is_null($user)) {
103+
continue;
104+
}
105+
98106
$userGroup = Repo::userGroup()->get($stageAssignment->getUserGroupId());
99107
$currentUserGroupAbbrev = strtolower($userGroup->getData('abbrev', 'en'));
100108

classes/ScieloSubmissionFactory.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ protected function retrieveSubmitter($submissionId)
6868
return '';
6969
}
7070

71-
$submitter = Repo::user()->get($userId);
71+
$submitter = Repo::user()->get($userId, true);
72+
if (is_null($submitter)) {
73+
return '';
74+
}
7275

7376
return $submitter->getFullName();
7477
}
@@ -82,7 +85,11 @@ protected function retrieveSubmitterCountry($submissionId)
8285
return '';
8386
}
8487

85-
$submitter = Repo::user()->get($userId);
88+
$submitter = Repo::user()->get($userId, true);
89+
if (is_null($submitter)) {
90+
return '';
91+
}
92+
8693
$submitterCountry = $submitter->getCountryLocalized();
8794

8895
return !is_null($submitterCountry) ? $submitterCountry : '';

0 commit comments

Comments
 (0)