Skip to content

Commit ab58f82

Browse files
Gets default instructions when it has not been filled
Issue: documentacao-e-tarefas/scielo#782 Signed-off-by: Jhon <jhon@lepidus.com.br>
1 parent 71dc406 commit ab58f82

4 files changed

Lines changed: 5 additions & 11 deletions

File tree

classes/dataverseConfiguration/DataverseConfiguration.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
define('DATASET_PUBLISH_SUBMISSION_ACCEPTED', 1);
44
define('DATASET_PUBLISH_SUBMISSION_PUBLISHED', 2);
55

6+
import('plugins.generic.dataverse.settings.DefaultAdditionalInstructions');
7+
68
class DataverseConfiguration extends DataObject
79
{
810
public function setDataverseUrl(string $url): void

classes/dispatchers/DatasetTabDispatcher.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function addResearchDataTab(string $hookName, array $params): bool
3636

3737
$configurationDAO = DAORegistry::getDAO('DataverseConfigurationDAO');
3838
$configuration = $configurationDAO->get($submission->getData('contextId'));
39-
$additionalInstructions = $configuration->getLocalizedData('additionalInstructions');
39+
$additionalInstructions = $configuration->getLocalizedAdditionalInstructions();
4040
$templateMgr->assign('dataverseAdditionalInstructions', $additionalInstructions);
4141

4242
$output .= sprintf(

classes/dispatchers/DraftDatasetFilesDispatcher.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function addDraftDatasetFileContainer(string $hookName, array $params): ?
3939
$contextId = $request->getContext()->getId();
4040
$configurationDAO = DAORegistry::getDAO('DataverseConfigurationDAO');
4141
$configuration = $configurationDAO->get($contextId);
42-
$additionalInstructions = $configuration->getLocalizedData('additionalInstructions');
42+
$additionalInstructions = $configuration->getLocalizedAdditionalInstructions();
4343
$templateMgr->assign('dataverseAdditionalInstructions', $additionalInstructions);
4444

4545
$templateOutput = $templateMgr->fetch($form->_template);

settings/DataverseSettingsForm.inc.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import('lib.pkp.classes.form.Form');
44
import('plugins.generic.dataverse.classes.dataverseConfiguration.DataverseConfigurationDAO');
55
import('plugins.generic.dataverse.dataverseAPI.actions.DataverseCollectionActions');
6-
import('plugins.generic.dataverse.settings.DefaultAdditionalInstructions');
76

87
class DataverseSettingsForm extends Form
98
{
@@ -65,14 +64,7 @@ public function initData(): void
6564
$this->setData($name, $value);
6665
}
6766

68-
$context = Application::get()->getRequest()->getContext();
69-
$primaryLocale = $context->getPrimaryLocale();
70-
if (!isset($configurationData['additionalInstructions'])
71-
|| empty($configurationData['additionalInstructions'][$primaryLocale])
72-
) {
73-
$defaultAdditionalInstructions = new DefaultAdditionalInstructions();
74-
$this->setData('additionalInstructions', $defaultAdditionalInstructions->getDefaultInstructions());
75-
}
67+
$this->setData('additionalInstructions', $configuration->getAdditionalInstructions());
7668
}
7769

7870
public function readInputData(): void

0 commit comments

Comments
 (0)