From 807f1b4aa169656b1a6a1ef350ffd6c55c5bb0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 26 Mar 2024 22:08:01 +0100
Subject: [PATCH 1/2] Fix layout in admin document generation

A layout issue in the admin document generation has been fixed, particularly in the ChillDocGeneratorBundle. Unnecessary elements such as table headers and multiple entity data rows in DocGeneratorTemplate have been removed, simplifying the view page and improving its performance.
---
 .../unreleased/Fixed-20240326-220740.yaml     |  5 +++
 .../DocGeneratorTemplate/index.html.twig      | 33 -------------------
 2 files changed, 5 insertions(+), 33 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20240326-220740.yaml

diff --git a/.changes/unreleased/Fixed-20240326-220740.yaml b/.changes/unreleased/Fixed-20240326-220740.yaml
new file mode 100644
index 000000000..078631037
--- /dev/null
+++ b/.changes/unreleased/Fixed-20240326-220740.yaml
@@ -0,0 +1,5 @@
+kind: Fixed
+body: Fix layout issue in document generation for admin (minor)
+time: 2024-03-26T22:07:40.044924041+01:00
+custom:
+  Issue: ""
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
index cfe071986..ee167bcf7 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
@@ -14,11 +14,6 @@
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
-            <th></th>
-            <th>{{ 'Title'|trans }}</th>
-            <th>{{ 'docgen.Context'|trans }}</th>
-            <th>{{ 'docgen.test generate'|trans }}</th>
-            <th>{{ 'Edit'|trans }}</th>
         {% endblock %}
 
         {% block table_entities_tbody %}
@@ -62,34 +57,6 @@
                 </div>
             {% endif %}
 
-
-            {% for entity in entities %}
-                <tr>
-                    <td>{{ entity.id }}</td>
-                    <td>{{ entity.name|localize_translatable_string}}</td>
-                    <td>{{ contextManager.getContextByKey(entity.context).name|trans }}</td>
-                    <td>
-                        <form method="get" action="{{ path('chill_docgenerator_test_generate_redirect') }}">
-                            <input type="hidden" name="returnPath" value="{{ app.request.query.get('returnPath', app.request.uri)|e('html_attr') }}" />
-                            <input type="hidden" name="template" value="{{ entity.id|e('html_attr') }}" />
-                            <input type="hidden" name="entityClassName" value="{{ contextManager.getContextByKey(entity.context).entityClass|e('html_attr') }}" />
-                            <input type="text" name="entityId" />
-
-                            <button type="submit" class="btn btn-mini btn-misc"><i class="fa fa-cog"></i>{{ 'docgen.test generate'|trans }}</button>
-                        </form>
-                    </td>
-                    <td>
-                        <ul class="record_actions">
-                            <li>
-                                {{ entity.file|chill_document_button_group('Template file', true, {small: true}) }}
-                            </li>
-                            <li>
-                                <a href="{{ chill_path_add_return_path('chill_crud_docgen_template_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
-                            </li>
-                        </ul>
-                    </td>
-                </tr>
-            {% endfor %}
         {% endblock %}
 
         {% block actions_before %}

From 8fd6986c47a3448ecd2ef194afdec2a53cbe5c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 26 Mar 2024 22:08:30 +0100
Subject: [PATCH 2/2] Release 2.18.1

---
 .changes/unreleased/Fixed-20240326-220740.yaml | 5 -----
 .changes/v2.18.1.md                            | 3 +++
 CHANGELOG.md                                   | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20240326-220740.yaml
 create mode 100644 .changes/v2.18.1.md

diff --git a/.changes/unreleased/Fixed-20240326-220740.yaml b/.changes/unreleased/Fixed-20240326-220740.yaml
deleted file mode 100644
index 078631037..000000000
--- a/.changes/unreleased/Fixed-20240326-220740.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: Fixed
-body: Fix layout issue in document generation for admin (minor)
-time: 2024-03-26T22:07:40.044924041+01:00
-custom:
-  Issue: ""
diff --git a/.changes/v2.18.1.md b/.changes/v2.18.1.md
new file mode 100644
index 000000000..f0d68925d
--- /dev/null
+++ b/.changes/v2.18.1.md
@@ -0,0 +1,3 @@
+## v2.18.1 - 2024-03-26
+### Fixed
+* Fix layout issue in document generation for admin (minor) 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a022a870d..8c0a6b008 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.18.1 - 2024-03-26
+### Fixed
+* Fix layout issue in document generation for admin (minor) 
+
 ## v2.18.0 - 2024-03-26
 ### Feature
 * ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation