Merge branch 'next'

Author: awallef

templates/bake/Controller/controller.twig

@@ -46,7 +46,7 @@ class {{ name }}Controller extends AppController
   public function initialize():void
   {
     parent::initialize();
-    $this->loadComponent('Search.Prg', [
+    $this->loadComponent('Search.Search', [
       'actions' => ['index']
     ]);
   }

templates/bake/Model/table.twig

@@ -61,7 +61,7 @@ class {{ name }}Table extends Table
             'comparison' => 'LIKE',
             'wildcardAny' => '*',
             'wildcardOne' => '?',
-            'field' => ['{{ displayField }}']
+            'fields' => ['{{ displayField }}']
         ]);
 {%- if behaviors %}
 

templates/bake/element/form.twig

@@ -66,8 +66,8 @@
               'cols' => 'col-xs-6 col-md-6 col-lg-4',
               'maxquantity' => -1,
               'restrictions' => [
-                Attachment\View\Helper\AttachmentHelper::TAG_RESTRICTED,
-                Attachment\View\Helper\AttachmentHelper::TYPES_RESTRICTED
+                Trois\Attachment\View\Helper\AttachmentHelper::TAG_RESTRICTED,
+                Trois\Attachment\View\Helper\AttachmentHelper::TYPES_RESTRICTED
                 ],
               'attachments' =>{% if 'add' not in action %} (${{singularVar}}->attachments)? ${{singularVar}}->attachments : []{% else %} []{% endif %},
             ]);?>
@@ -92,8 +92,8 @@
               'cols' => 'col-xs-6 col-md-6 col-lg-4',
               'maxquantity' => 1,
               'restrictions' => [
-                Attachment\View\Helper\AttachmentHelper::TAG_RESTRICTED,
-                Attachment\View\Helper\AttachmentHelper::TYPES_RESTRICTED
+                Trois\Attachment\View\Helper\AttachmentHelper::TAG_RESTRICTED,
+                Trois\Attachment\View\Helper\AttachmentHelper::TYPES_RESTRICTED
                 ],
                 'attachments' =>{% if 'add' not in action %} (${{singularVar}}->attachment)? [${{singularVar}}->attachment] : []{% else %} []{% endif %},
               ]