From 4dc56db018a1b7173fd567c3bc71f20d772b1f5a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:51:32 +0200
Subject: [PATCH] show of activity adjusted for private comment

---
 .../Resources/views/Activity/show.html.twig   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 512557491..b6d375933 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -146,19 +146,18 @@
                 </dd>
             {% endif %}
 
-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.userId is same as(app.user.id) %}
-                {% if t.privateCommentLabel is not empty %}
-                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                {% else %}
-                    <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
-                {% endif %}
-                <dd>
-                    {%- if entity.privateComment.empty -%}
-                        <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
-                    {%- else -%}
-                        {{ entity.privateComment|chill_entity_render_box }}
-                    {%- endif -%}
-                </dd>
+            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                {% set userID = app.user.id %}
+                    {% if userID in entity.privateComment.comments|keys %}
+                        {% if t.privateCommentLabel is not empty %}
+                            <dt class="inline">{{ t.privateCommentLabel }}</dt>
+                        {% else %}
+                            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+                        {% endif %}
+                        <dd>
+                            {{ entity.privateComment.comments[userID]|chill_entity_render_box }}
+                        </dd>
+                    {% endif %}
             {% endif %}
 
             {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}