modify test and layout

templates/components/itilobject/layout.html.twig

@@ -58,6 +58,7 @@
 
 <div id="itil-object-container" class="mt-n1 {{ collapsed_cls }} {{ expanded_cls }}">
 
+    <!-- Main form opening for new item -->
     {% if item.isNewItem() and not template_preview %}
         {{ include('components/itilobject/mainform_open.html.twig') }}
     {% endif %}
@@ -85,12 +86,19 @@
         {% endif %}
     </div>
 
+    <!-- Main form closing for new item -->
+    {% if item.isNewItem() and not template_preview %}
+        {{ include('components/itilobject/mainform_close.html.twig') }}
+    {% endif %}
+
     {% if not template_preview %}
         {% if not item.isNewItem() %}
+            <!-- Main form opening for action buttons display by footer -->
             {{ include('components/itilobject/mainform_open.html.twig') }}
         {% endif %}
         {{ include('components/itilobject/footer.html.twig') }}
         {% if not item.isNewItem() %}
+            <!-- Main form closing for action button display by footer -->
             {{ include('components/itilobject/mainform_close.html.twig') }}
         {% endif %}
     {% endif %}

tests/functional/TicketTest.php

@@ -1678,7 +1678,7 @@ private function checkFormOutput(
         // Check that the itil form exist
         $matches = iterator_to_array($crawler->filter("#itil-form"));
         $this->assertCount(
-            ($itil_form === true ? 1 : 0),
+            ($itil_form === true ? 2 : 1),
             $matches,
             ($itil_form === true ? 'ITIL form' : 'ITIL form present') . ' ' . $caller
         );