hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address PR comments

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-02-17 14:46:08 +01:00
parent bd110bb8e7
commit eaa1feb765
119 changed files with 358 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -110,9 +110,9 @@
/>
</td>
{% endif %}
{% if basket.getPusher(app) %}
{% if basket.getPusher() %}
<td>
{% set pusher = basket.getPusher(app).getDisplayName(app['translator']) %}
{% set pusher = basket.getPusher().getDisplayName() %}
<img
class="basketTips"
title="{% trans with {'%pusher%' : pusher} %}paniers:: panier recu de %pusher%{% endtrans %}"
@@ -353,9 +353,9 @@
<td style="width:100%;">
<table style=width:100%>
{% for choice in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(app['authentication'].getUser(), app).getCanSeeOthers() or choice.getParticipant().getUser() == app['authentication'].getUser() %}
{% if basket.getValidation().getParticipant(app['authentication'].getUser()).getCanSeeOthers() or choice.getParticipant().getUser() == app['authentication'].getUser() %}
<tr>
<td> {{ choice.getParticipant().getUser().getDisplayName(app['translator']) }} </td>
<td> {{ choice.getParticipant().getUser().getDisplayName() }} </td>
<td>
{% if choice.getParticipant().getCanAgree() %}
{% if choice.getAgreement() == true %}