fix(form): show validator dropdown before submit button

Author: btry

inc/form.class.php

@@ -1024,15 +1024,6 @@ public function displayUserForm() : void {
       ]);
       // Delete saved answers if any
       unset($_SESSION['formcreator']['data']);
-
-      // Show validator selector
-      if (Plugin::isPluginActive('advform')) {
-         echo PluginAdvformForm_Validator::dropdownValidator($this);
-      } else {
-         if ($this->validationRequired()) {
-            echo PluginFormcreatorForm_Validator::dropdownValidator($this);
-         }
-      }
    }
 
    /**

inc/form_validator.class.php

@@ -671,6 +671,14 @@ public static function dropdownValidatorGroup(): string {
     *
     */
    public static function dropdownValidator(PluginFormcreatorForm $form): string {
+      if (Plugin::isPluginActive('advform')) {
+         return PluginAdvformForm_Validator::dropdownValidator($form);
+      }
+
+      if (!$form->validationRequired()) {
+         return '';
+      }
+
       $validators = [];
       $formValidator = new PluginFormcreatorForm_Validator();
       // Validators of either user type or group type

templates/pages/userform.html.twig

@@ -122,6 +122,11 @@
               }
            )
         </script>
+
+        {{ call('PluginFormcreatorForm_Validator::dropdownValidator', [
+              item
+        ])|raw }}
+
         <div class="center">
           {{ call('Html::submit', [
               __('Send'),