Skip to content

pkp/pkp-lib#11796 Fix validation of author competing interest statement #11797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

pkp/pkp-lib#11796 Fix validation of author competing interest statement #11797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion classes/author/Repository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public function validate($author, $props, Submission $submission, Context $conte
// Check for input from disallowed locales
ValidatorFactory::allowedLocales($validator, $schemaService->getMultilingualProps(PKPSchemaService::SCHEMA_AUTHOR), $allowedLocales);

$validator->after(function ($validator) use ($props, $submission) {
$validator->after(function ($validator) use ($props, $submission, $context, $primaryLocale) {
// publicationId must match an existing publication that is not yet published
if (isset($props['publicationId']) && !$validator->errors()->get('publicationId')) {
$publication = Repo::publication()->get($props['publicationId']);
Expand All @@ -157,6 +157,14 @@ public function validate($author, $props, Submission $submission, Context $conte
);
}
}

// Author CI statement required?
if ($context->getSetting('requireAuthorCompetingInterests') && empty($props['competingInterests'][$primaryLocale])) {
$validator->errors()->add(
"competingInterests.{$primaryLocale}",
__('author.competingInterests.required')
);
}
});

$errors = [];
Expand Down
1 change: 1 addition & 0 deletions classes/components/forms/publication/ContributorForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public function __construct(string $action, array $locales, ?Submission $submiss
'label' => __('author.competingInterests'),
'description' => __('author.competingInterests.description'),
'isMultilingual' => true,
'isRequired' => true,
]));
}
$this->addField(new FieldRichTextarea('biography', [
Expand Down
5 changes: 4 additions & 1 deletion schemas/author.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
"competingInterests": {
"type": "string",
"description": "A declaration of potential competing interests.",
"multilingual": "true"
"multilingual": "true",
"validation": [
"nullable"
]
},
"country": {
"type": "string",
Expand Down