|
54 | 54 | use PKP\mail\mailables\SubmissionSavedForLater; |
55 | 55 | use PKP\notification\Notification; |
56 | 56 | use PKP\notification\NotificationSubscriptionSettingsDAO; |
| 57 | +use PKP\observers\events\MetadataChanged; |
57 | 58 | use PKP\orcid\OrcidManager; |
58 | 59 | use PKP\plugins\Hook; |
59 | 60 | use PKP\plugins\PluginRegistry; |
|
68 | 69 | use PKP\security\Role; |
69 | 70 | use PKP\security\Validation; |
70 | 71 | use PKP\services\PKPSchemaService; |
| 72 | +use PKP\stageAssignment\StageAssignment; |
71 | 73 | use PKP\submission\GenreDAO; |
72 | 74 | use PKP\submission\PKPSubmission; |
73 | 75 | use PKP\submission\reviewAssignment\ReviewAssignment; |
74 | 76 | use PKP\submissionFile\SubmissionFile; |
75 | 77 | use PKP\userGroup\UserGroup; |
76 | | -use PKP\observers\events\MetadataChanged; |
77 | | -use PKP\stageAssignment\StageAssignment; |
78 | | - |
79 | 78 |
|
80 | 79 | class PKPSubmissionController extends PKPBaseController |
81 | 80 | { |
@@ -607,7 +606,7 @@ public function add(Request $illuminateRequest): JsonResponse |
607 | 606 | $submitterUserGroups = UserGroup::withContextIds($context->getId()) |
608 | 607 | ->withRoleIds([Role::ROLE_ID_MANAGER, Role::ROLE_ID_AUTHOR]) |
609 | 608 | ->whereHas('userUserGroups', function ($query) use ($user) { |
610 | | - $query->withUserId($user->getId()); |
| 609 | + $query->withUserId($user->getId())->withActive(); |
611 | 610 | }) |
612 | 611 | ->get(); |
613 | 612 |
|
@@ -1342,7 +1341,7 @@ public function publishPublication(Request $illuminateRequest): JsonResponse |
1342 | 1341 |
|
1343 | 1342 | foreach ($stageAssignments as $stageAssignment) { |
1344 | 1343 | $userGroup = $stageAssignment->userGroup; |
1345 | | - if ($userGroup && $userGroup->roleId === Role::ROLE_ID_AUTHOR){ |
| 1344 | + if ($userGroup && $userGroup->roleId === Role::ROLE_ID_AUTHOR) { |
1346 | 1345 | $stageAssignment->canChangeMetadata = 0; |
1347 | 1346 | $stageAssignment->save(); |
1348 | 1347 | } |
@@ -1615,7 +1614,7 @@ public function addContributor(Request $illuminateRequest): JsonResponse |
1615 | 1614 | Repo::author()->edit($author, ['orcidVerificationRequested']); |
1616 | 1615 | dispatch(new SendAuthorMail($author, $submissionContext, true)); |
1617 | 1616 | } catch (\Exception $exception) { |
1618 | | - OrcidManager::logError("Could not send email to new author with authorId: {$author->getId()}. Reason: $exception"); |
| 1617 | + OrcidManager::logError("Could not send email to new author with authorId: {$author->getId()}. Reason: {$exception}"); |
1619 | 1618 | } |
1620 | 1619 | } |
1621 | 1620 |
|
|
0 commit comments