From 2a280b814fdfd1f51b30fb6dad2987edb046fb5f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 9 Sep 2025 17:35:49 +0200
Subject: [PATCH] Refactor view templates: relocate 'merge' action block and
 standardize 'duplicate link' block handling

---
 .changes/unreleased/Fixed-20250909-173639.yaml       |  6 ++++++
 .../src/Resources/views/asideActivity/view.html.twig |  1 +
 .../src/Resources/views/CV/view.html.twig            |  2 +-
 .../src/Resources/views/Frein/view.html.twig         |  1 +
 .../src/Resources/views/Immersion/view.html.twig     |  2 ++
 .../views/ProjetProfessionnel/view.html.twig         |  1 +
 .../Resources/views/CRUD/_view_content.html.twig     | 12 +-----------
 .../Resources/views/ThirdParty/view.html.twig        | 11 +++++++++++
 8 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20250909-173639.yaml

diff --git a/.changes/unreleased/Fixed-20250909-173639.yaml b/.changes/unreleased/Fixed-20250909-173639.yaml
new file mode 100644
index 000000000..57dc42e20
--- /dev/null
+++ b/.changes/unreleased/Fixed-20250909-173639.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix display of 'duplicate' and 'merge' buttons in CRUD templates
+time: 2025-09-09T17:36:39.960419639+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
index 4ef237336..ef6faa9c6 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -55,5 +55,6 @@
 			</dl>
 
 		{% endblock %}
+        {% block content_view_actions_duplicate_link %}{% endblock %}
 	{% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig
index 7caa8c709..b7b930ca1 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig
@@ -118,7 +118,7 @@
 
         {{ entity.notes|chill_print_or_message("Aucune note", 'blockquote') }}
     {% endblock crud_content_view_details %}
-
+    {% block content_view_actions_duplicate_link %}{% endblock %}
     {% block content_view_actions_back %}
         <li class="cancel">
             <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig
index a5ef2b350..90737089d 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig
@@ -46,6 +46,7 @@
             </dd>
         </dl>
     {% endblock crud_content_view_details %}
+    {% block content_view_actions_duplicate_link %}{% endblock %}
 
     {% block content_view_actions_back %}
         <li class="cancel">
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig
index 3dda01fbd..fd0f57d49 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig
@@ -206,6 +206,8 @@
             </a>
         </li>
     {% endblock %}
+    {% block content_view_actions_duplicate_link %}{% endblock %}
+
     {% block content_view_actions_after %}
         <li>
             <a class="btn btn-misc" href="{{ chill_return_path_or('chill_crud_immersion_bilan', { 'id': entity.id, 'person_id': entity.person.id }) }}">
diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig
index 535a77a20..ce1c7c500 100644
--- a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig
+++ b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig
@@ -94,6 +94,7 @@
 
 
     {% endblock crud_content_view_details %}
+    {% block content_view_actions_duplicate_link %}{% endblock %}
 
     {% block content_view_actions_back %}
         <li class="cancel">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
index 71755cc11..058ec412a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig
@@ -44,17 +44,7 @@
                 {% endif %}
                 {% endif %}
             {% endblock content_view_actions_duplicate_link %}
-            {% block content_view_actions_merge %}
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_thirdparty_find_duplicate',
-                        { 'thirdparty_id': entity.id }) }}"
-                       title="{{ 'Merge'|trans }}"
-                       class="btn btn-misc">
-                        <i class="bi bi-chevron-contract"></i>
-                        {{ 'Merge'|trans }}
-                    </a>
-                </li>
-            {% endblock %}
+            {% block content_view_actions_merge %}{% endblock %}
             {% block content_view_actions_edit_link %}
                 {% if chill_crud_action_exists(crud_name, 'edit') %}
                 {% if is_granted(chill_crud_config('role', crud_name, 'edit'), entity) %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
index 2bd6f426f..473e7c950 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@@ -152,6 +152,17 @@
                     {% endif %}
                 </dl>
             {% endblock %}
+            {% block content_view_actions_merge %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_thirdparty_find_duplicate',
+                        { 'thirdparty_id': entity.id }) }}"
+                       title="{{ 'Merge'|trans }}"
+                       class="btn btn-misc">
+                        <i class="bi bi-chevron-contract"></i>
+                        {{ 'Merge'|trans }}
+                    </a>
+                </li>
+            {% endblock %}
             {% block content_form_actions_delete %}{% endblock %}
             {% block content_view_actions_duplicate_link %}{% endblock %}
         {% endembed %}