Merge branch 'fix_default_instructions_3_3_0-843' into 'stable-3_3_0'

Define default instructions for empty additional instructions of available locales.

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

Author: thiagolepidus

settings/DataverseSettingsForm.inc.php

@@ -3,6 +3,7 @@
 import('lib.pkp.classes.form.Form');
 import('plugins.generic.dataverse.classes.dataverseConfiguration.DataverseConfigurationDAO');
 import('plugins.generic.dataverse.dataverseAPI.actions.DataverseCollectionActions');
+import('plugins.generic.dataverse.settings.DefaultAdditionalInstructions');
 
 class DataverseSettingsForm extends Form
 {
@@ -90,6 +91,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);
         }
@@ -112,4 +114,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>2.8.4.0</release>
-	<date>2025-08-15</date>
+	<release>2.8.5.0</release>
+	<date>2025-10-14</date>
 	<lazy-load>1</lazy-load>
 	<class>DataversePlugin</class>
 </version>