Merge branches 'develop' and 'master' of https://git.unicaen.fr/lib/unicaen/app

src/UnicaenApp/Form/View/Helper/FormControlGroup.php

@@ -57,7 +57,7 @@ class FormControlGroup extends AbstractHelper
     protected $helpers = [
         Date::class           => 'formDate',
         DateInfSup::class     => 'formDateInfSup',
-        DateTime::class       => 'formDateTime',
+    //    DateTime::class       => 'formDateTime',
     ];
 
 
@@ -254,7 +254,10 @@ class FormControlGroup extends AbstractHelper
             $helper = $this->getView()->plugin('formSearchAndSelect');
             $helper->setAutocompleteMinLength(2);
             $html = $helper($element);
-        } else {
+        } elseif($element instanceof DateTime) {
+            $helper = $this->getView()->plugin('formDateTime');
+            $html = $helper($element);
+        }else{
             if (is_string($pluginClass)) {
                 $helper = $this->getView()->plugin($pluginClass);
                 $html   = $helper($element);