fix(question): duplication may make several items having same position

Signed-off-by: Thierry Bugier <tbugier@teclib.com>

Author: btry

ajax/question_duplicate.php

@@ -50,7 +50,12 @@
     exit;
 }
 
-if (($newId = $question->duplicate(['progress' => false])) === false) {
+$newRow = 1 + PluginFormcreatorCommon::getMax(
+    $question, [
+        'plugin_formcreator_sections_id' => $question->fields['plugin_formcreator_sections_id']
+    ], 'row'
+);
+if (($newId = $question->duplicate(['progress' => false, 'fields' => ['row' => $newRow]])) === false) {
     http_response_code(500);
     exit;
 }
@@ -60,6 +65,7 @@
     http_response_code(500);
     exit;
 }
+
 $json = [
     'y'      => $question->fields['row'],
     'x'      => $question->fields['col'],

inc/question.class.php

@@ -316,15 +316,8 @@ private function checkBeforeSave($input) : array {
          return [];
       }
       // - field type is compatible with accessibility of the form
-      $section = new PluginFormcreatorSection();
-      $sectionFk = PluginFormcreatorSection::getForeignKeyField();
-      if (isset($input[$sectionFk])) {
-         $section->getFromDB($input[$sectionFk]);
-      } else {
-         $section->getFromDB($this->fields[$sectionFk]);
-      }
       $form = new PluginFormcreatorForm();
-      $form->getFromDBBySection($section);
+      $form->getFromDBByQuestion($this);
       if ($form->isPublicAccess() && !$this->field->isAnonymousFormCompatible()) {
          Session::addMessageAfterRedirect(__('This type of question is not compatible with public forms.', 'formcreator'), false, ERROR);
          return [];
@@ -839,6 +832,17 @@ public function duplicate(array $options = []) {
 
       $sectionFk = PluginFormcreatorSection::getForeignKeyField();
       $export = $this->export(true);
+
+      // Amend some data (used when duplicating a question from the form designer UI)
+      if (isset($options['fields'])) {
+         foreach ($options['fields'] as $key => $value) {
+            if ($value === null) {
+               unset($export[$key]);
+               continue;
+            }
+            $export[$key] = $value;
+         }
+      }
       $newQuestionId = static::import($linker, $export, $this->fields[$sectionFk]);
 
       if ($newQuestionId === false) {