|
57 | 57 | use PKP\mail\mailables\SubmissionSavedForLater; |
58 | 58 | use PKP\notification\Notification; |
59 | 59 | use PKP\notification\NotificationSubscriptionSettingsDAO; |
| 60 | +use PKP\observers\events\MetadataChanged; |
60 | 61 | use PKP\orcid\OrcidManager; |
61 | 62 | use PKP\plugins\Hook; |
62 | 63 | use PKP\plugins\PluginRegistry; |
|
73 | 74 | use PKP\security\Role; |
74 | 75 | use PKP\security\Validation; |
75 | 76 | use PKP\services\PKPSchemaService; |
| 77 | +use PKP\stageAssignment\StageAssignment; |
76 | 78 | use PKP\submission\GenreDAO; |
77 | 79 | use PKP\submission\reviewAssignment\ReviewAssignment; |
78 | 80 | use PKP\submissionFile\SubmissionFile; |
79 | 81 | use PKP\userGroup\UserGroup; |
80 | | -use PKP\observers\events\MetadataChanged; |
81 | | -use PKP\stageAssignment\StageAssignment; |
82 | | - |
83 | 82 |
|
84 | 83 | class PKPSubmissionController extends PKPBaseController |
85 | 84 | { |
@@ -643,7 +642,7 @@ public function add(Request $illuminateRequest): JsonResponse |
643 | 642 | $submitterUserGroups = UserGroup::withContextIds($context->getId()) |
644 | 643 | ->withRoleIds([Role::ROLE_ID_MANAGER, Role::ROLE_ID_AUTHOR]) |
645 | 644 | ->whereHas('userUserGroups', function ($query) use ($user) { |
646 | | - $query->withUserId($user->getId()); |
| 645 | + $query->withUserId($user->getId())->withActive(); |
647 | 646 | }) |
648 | 647 | ->get(); |
649 | 648 |
|
@@ -1461,7 +1460,7 @@ public function publishPublication(Request $illuminateRequest): JsonResponse |
1461 | 1460 |
|
1462 | 1461 | foreach ($stageAssignments as $stageAssignment) { |
1463 | 1462 | $userGroup = $stageAssignment->userGroup; |
1464 | | - if ($userGroup && $userGroup->roleId === Role::ROLE_ID_AUTHOR){ |
| 1463 | + if ($userGroup && $userGroup->roleId === Role::ROLE_ID_AUTHOR) { |
1465 | 1464 | $stageAssignment->canChangeMetadata = 0; |
1466 | 1465 | $stageAssignment->save(); |
1467 | 1466 | } |
|
0 commit comments