Merge branch 'upgrade-sf5' into signature-app-master

src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts

@@ -53,14 +53,17 @@ export const handleAdd = (button: any): void => {
     let
         empty_explain: HTMLLIElement | null = collection.querySelector('li[data-collection-empty-explain]'),
         entry = document.createElement('li'),
-        counter = collection.childNodes.length + 1,
-        content = prototype.replace(new RegExp('__name__', 'g'), counter.toString()),
+        counter = collection.querySelectorAll('li.entry').length, // Updated counter logic
+        content = prototype.replace(/__name__/g, counter.toString()),
         event = new CustomEvent('collection-add-entry', {detail: new CollectionEventPayload(collection, entry)});
 
+    console.log(counter)
+    console.log(content)
+
     entry.innerHTML = content;
     entry.classList.add('entry');
 
-    if ("dataCollectionRegular" in collection.dataset) {
+    if ("collectionRegular" in collection.dataset) {
         initializeRemove(collection, entry);
         if (empty_explain !== null) {
             empty_explain.remove();

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -159,3 +159,5 @@ document.addEventListener('DOMContentLoaded', function(e) {
     loadDynamicPicker(document)
 })
 
+window.loadDynamicPicker = loadDynamicPicker;
+

src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig

@@ -1,5 +1,5 @@
     {% set formId = crudMainFormId|default('crud_main_form') %}
-    
+
     {% block crud_content_header %}
         <h1 class="mb-5">{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
     {% endblock crud_content_header %}
@@ -21,9 +21,9 @@
         <ul class="record_actions sticky-form-buttons">
             {% block content_form_actions_back %}
                 <li class="cancel">
-                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
-                        {{ 'Cancel'|trans }}
-                    </a>
+{#                    <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">#}
+{#                        {{ 'Cancel'|trans }}#}
+{#                    </a>#}
                 </li>
             {% endblock %}
             {% block content_form_actions_before %}{% endblock %}