Merge branch 'fix_default_instructions_3_4_0-843' into 'main'

Define default instructions for empty additional instructions of available locales

See merge request softwares-pkp/plugins_ojs/dataverse!210

Author: thiagolepidus

DataverseSettingsForm.php

@@ -14,6 +14,7 @@
 use APP\plugins\generic\dataverse\classes\exception\DataverseException;
 use APP\plugins\generic\dataverse\classes\dataverseConfiguration\DataverseConfiguration;
 use APP\plugins\generic\dataverse\classes\dataverseConfiguration\DataverseConfigurationDAO;
+use APP\plugins\generic\dataverse\classes\dataverseConfiguration\DefaultAdditionalInstructions;
 use APP\plugins\generic\dataverse\dataverseAPI\actions\DataverseCollectionActions;
 
 class DataverseSettingsForm extends Form
@@ -101,6 +102,7 @@ public function fetch($request, $template = null, $display = false)
 
     public function execute(...$functionArgs)
     {
+        $this->setDefaultAdditionalInstructions();
         foreach (self::CONFIG_VARS as $configVar => $type) {
             $this->plugin->updateSetting($this->contextId, $configVar, $this->getData($configVar), $type);
         }
@@ -123,4 +125,19 @@ public function validateConfiguration(): bool
 
         return true;
     }
+
+    private function setDefaultAdditionalInstructions(): void
+    {
+        $defaultAdditionalInstructions = new DefaultAdditionalInstructions();
+        $defaultInstructions = $defaultAdditionalInstructions->getDefaultInstructions();
+
+        $additionalInstructions = $this->getData('additionalInstructions');
+        foreach ($defaultInstructions as $locale => $instructions) {
+            if (empty($additionalInstructions[$locale])) {
+                $additionalInstructions[$locale] = $instructions;
+            }
+        }
+
+        $this->setData('additionalInstructions', $additionalInstructions);
+    }
 }

version.xml

@@ -13,8 +13,8 @@
 <version>
 	<application>dataverse</application>
 	<type>plugins.generic</type>
-	<release>3.3.3.2</release>
-	<date>2025-09-15</date>
+	<release>3.3.4.0</release>
+	<date>2025-10-14</date>
 	<lazy-load>1</lazy-load>
 	<class>DataversePlugin</class>
 </version>