From 1a2e1eaf2a6d7221d16e41a61cb290b0df1de2fd Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sun, 23 Jan 2022 15:09:04 +0100
Subject: [PATCH] put notification comments in a separate include

---
 .../Notification/_item_comments.html.twig     | 77 +++++++++++++++++++
 .../views/Notification/show.html.twig         | 76 +-----------------
 2 files changed, 78 insertions(+), 75 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig
new file mode 100644
index 000000000..b741abf4a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig
@@ -0,0 +1,77 @@
+{% import '@ChillPerson/AccompanyingCourse/Comment/macro_showItem.html.twig' as m %}
+
+{% macro recordAction(comment) %}
+    {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %}
+        <li>
+            <a href="{{ chill_path_forward_return_path('chill_main_notification_show', {
+                '_fragment': 'comment-' ~ comment.id,
+                'edit': comment.id,
+                'id': comment.notification.id
+            }) }}" class="btn btn-edit" title="{{ 'Edit'|trans }}"
+            ></a>
+        </li>
+    {% endif %}
+{% endmacro %}
+
+<div class="notification-comment-list my-5">
+    <h2 class="chill-blue">{{ 'notification.comments_list'|trans }}</h2>
+    
+    {% if notification.comments|length > 0 %}
+        <div class="flex-table">
+            {% for comment in notification.comments %}
+                
+                {% if editedCommentForm is null or editedCommentId != comment.id %}
+                    {{ m.show_comment(comment, {
+                        'recordAction': _self.recordAction(comment)
+                    }) }}
+                {% else %}
+                    <div class="item-bloc">
+                        <div class="item-row row">
+                            <a id="comment-{{ comment.id }}"></a>
+                            
+                            {{ form_start(editedCommentForm) }}
+                            {{ form_errors(editedCommentForm) }}
+                            {{ form_widget(editedCommentForm.content) }}
+                            <input type="hidden" name="form" value="edit" />
+                            <ul class="record_actions">
+                                <li class="cancel">
+                                    <a href="{{ chill_path_forward_return_path('chill_main_notification_show', {
+                                        '_fragment': 'comment-' ~ comment.id,
+                                        'id': notification.id }) }}" class="btn btn-cancel">
+                                        {{ 'cancel'|trans }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
+                                </li>
+                            </ul>
+                            {{ form_end(editedCommentForm) }}
+                        
+                        </div>
+                    </div>
+                {% endif %}
+            
+            {% endfor %}
+        </div>
+    {% else %}
+        <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
+    {% endif %}
+    
+    {% if appendCommentForm is not null %}
+        <div class="new-comment my-5">
+            <h2 class="chill-blue mb-4">{{ 'Write a new comment'|trans }}</h2>
+            
+            {{ form_start(appendCommentForm) }}
+            {{ form_errors(appendCommentForm) }}
+            {{ form_widget(appendCommentForm.content) }}
+            <input type="hidden" name="form" value="append" />
+            <ul class="record_actions">
+                <li>
+                    <button class="btn btn-create" type="submit">{{ 'notification.append_comment'|trans }}</button>
+                </li>
+            </ul>
+            {{ form_end(appendCommentForm) }}
+        
+        </div>
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
index ed4a05c34..c8834c07c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
@@ -14,21 +14,6 @@
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
 {% endblock %}
 
-{% import '@ChillPerson/AccompanyingCourse/Comment/macro_showItem.html.twig' as m %}
-
-{% macro recordAction(comment) %}
-    {% if is_granted('CHILL_MAIN_NOTIFICATION_COMMENT_EDIT', comment) %}
-    <li>
-        <a href="{{ chill_path_forward_return_path('chill_main_notification_show', {
-            '_fragment': 'comment-' ~ comment.id,
-            'edit': comment.id,
-            'id': comment.notification.id
-        }) }}" class="btn btn-edit" title="{{ 'Edit'|trans }}"
-        ></a>
-    </li>
-    {% endif %}
-{% endmacro %}
-
 {% block content %}
 <div class="col-10 notification notification-show">
 
@@ -45,66 +30,7 @@
         } %}
     </div>
 
-    <div class="notification-comment-list my-5">
-        <h2 class="chill-blue">{{ 'notification.comments_list'|trans }}</h2>
-
-        {% if notification.comments|length > 0 %}
-            <div class="flex-table">
-                {% for comment in notification.comments %}
-
-                    {% if editedCommentForm is null or editedCommentId != comment.id %}
-                        {{ m.show_comment(comment, {
-                            'recordAction': _self.recordAction(comment)
-                        }) }}
-                    {% else %}
-                        <div class="item-bloc">
-                            <div class="item-row row">
-                                <a id="comment-{{ comment.id }}"></a>
-
-                                {{ form_start(editedCommentForm) }}
-                                {{ form_errors(editedCommentForm) }}
-                                {{ form_widget(editedCommentForm.content) }}
-                                <input type="hidden" name="form" value="edit" />
-                                <ul class="record_actions">
-                                    <li class="cancel">
-                                        <a href="{{ chill_path_forward_return_path('chill_main_notification_show', {
-                                            '_fragment': 'comment-' ~ comment.id,
-                                            'id': notification.id }) }}" class="btn btn-cancel">
-                                            {{ 'cancel'|trans }}
-                                        </a>
-                                    </li>
-                                    <li>
-                                        <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
-                                    </li>
-                                </ul>
-                                {{ form_end(editedCommentForm) }}
-
-                            </div>
-                        </div>
-                    {% endif %}
-
-                {% endfor %}
-            </div>
-        {% endif %}
-
-        {% if appendCommentForm is not null %}
-        <div class="new-comment my-5">
-            <h2 class="chill-blue mb-4">{{ 'Write a new comment'|trans }}</h2>
-
-            {{ form_start(appendCommentForm) }}
-            {{ form_errors(appendCommentForm) }}
-            {{ form_widget(appendCommentForm.content) }}
-            <input type="hidden" name="form" value="append" />
-            <ul class="record_actions">
-                <li>
-                    <button class="btn btn-create" type="submit">{{ 'notification.append_comment'|trans }}</button>
-                </li>
-            </ul>
-            {{ form_end(appendCommentForm) }}
-
-        </div>
-        {% endif %}
-    </div>
+    {% include 'ChillMainBundle:Notification:_item_comments.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">