From 0ca3469bf3a57a281d0be2f187238a8cae107390 Mon Sep 17 00:00:00 2001
From: Harrys Ravalomanana <hra@esokia.com>
Date: Wed, 27 Nov 2019 15:26:50 +0400
Subject: [PATCH] PHRAS-2829 lightbox  hide list of users

---
 templates/mobile/lightbox/sc_note.html.twig   | 14 +++---
 .../lightbox/basket_content_report.html.twig  | 45 +++++++++----------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/templates/mobile/lightbox/sc_note.html.twig b/templates/mobile/lightbox/sc_note.html.twig
index fe3ed24cd8..e1c783d245 100644
--- a/templates/mobile/lightbox/sc_note.html.twig
+++ b/templates/mobile/lightbox/sc_note.html.twig
@@ -1,21 +1,19 @@
 {% for validationDatas in basket_element.getValidationDatas() %}
-  <li>
+    {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
+
+      <li>
     <div class="validate-icon">
-        {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
-           {% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% endif %}
+        {% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% endif %}
            {% if validationDatas.getAgreement() == false  and validationDatas.getAgreement() is not null %}<span class="icomoon icon-disagree">&#xe971;  {{ validationDatas.getAgreement() }}</span>{% endif %}
-        {% endif %}
     </div>
     <div class="validate-info">
       <h3>
         {{ validationDatas.getParticipant().getUser().getDisplayName() }}
       </h3>
-        {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
-          {% if validationDatas.getNote() != '' %}
+         {% if validationDatas.getNote() != '' %}
         <p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p>
         {% endif %}
-      {% endif %}
-
     </div>
   </li>
+    {% endif %}
 {% endfor %}
diff --git a/templates/web/lightbox/basket_content_report.html.twig b/templates/web/lightbox/basket_content_report.html.twig
index 224a604eac..7a9940354e 100644
--- a/templates/web/lightbox/basket_content_report.html.twig
+++ b/templates/web/lightbox/basket_content_report.html.twig
@@ -17,32 +17,31 @@
                 </div>
                 <div class="chim-right">
                     {% for validationDatas in basket_element.getValidationDatas()%}
-                        <div class="basket_report_user_wrapper ui-corner-all">
-                                {% if validationDatas.getAgreement() == true %}
-                                    {% set imguser = '<span class="icomoon icon-agree">&#xe95f;</span>' %}
-                                    {% set styleuser = '' %}
-                                {% elseif validationDatas.getAgreement() is null %}
-                                    {% set imguser = '&nbsp;' %}
-                                    {% set styleuser = 'margin-left:18px;' %}
-                                {% else %}
-                                    {% set imguser = '<span class="icomoon icon-disagree">&#xe971;</span>' %}
-                                    {% set styleuser = '' %}
-                                {% endif %}
+                        {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
 
-                             <div class="validate-icon">
-                                 {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
-                                     {{imguser|raw}}
-                                 {% endif %}
-                            </div>
-                            <div class="validate-info">
-                                <h3> {{validationDatas.getParticipant().getUser().getDisplayName()}}</h3>
-                                {% if validationDatas.getNote() != '' %}
-                                    {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
-                                        <p> {{validationDatas.getNote()|nl2br}}</p>
+                            <div class="basket_report_user_wrapper ui-corner-all">
+                                    {% if validationDatas.getAgreement() == true %}
+                                        {% set imguser = '<span class="icomoon icon-agree">&#xe95f;</span>' %}
+                                        {% set styleuser = '' %}
+                                    {% elseif validationDatas.getAgreement() is null %}
+                                        {% set imguser = '&nbsp;' %}
+                                        {% set styleuser = 'margin-left:18px;' %}
+                                    {% else %}
+                                        {% set imguser = '<span class="icomoon icon-disagree">&#xe971;</span>' %}
+                                        {% set styleuser = '' %}
                                     {% endif %}
-                                {% endif %}
+
+                                 <div class="validate-icon">
+                                        {{imguser|raw}}
+                                </div>
+                                <div class="validate-info">
+                                    <h3> {{validationDatas.getParticipant().getUser().getDisplayName()}}</h3>
+                                    {% if validationDatas.getNote() != '' %}
+                                       <p> {{validationDatas.getNote()|nl2br}}</p>
+                                    {% endif %}
+                                </div>
                             </div>
-                        </div>
+                        {% endif %}
                     {% endfor %}
                 </div>
             </div>