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

PHRAS-2386 #adding fix of feedback block #time 2h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-06-12 11:06:19 +04:00
parent f05b8d2a47
commit 76509781eb
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/www/common/images/icons/basket_push.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/www/common/images/icons/basket_push_unread.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/www/common/images/icons/basket_validation.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1010 B

After

Width:  |  Height:  |  Size: 1.3 KiB

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

@@ -381,7 +381,10 @@
{% for choice in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or choice.getParticipant().getUser() == app.getAuthenticatedUser() %}
<tr>
<td> {{ choice.getParticipant().getUser().getDisplayName() }} </td>
<td style="position: relative">
<span class="feedback_user_name">{{ choice.getParticipant().getUser().getDisplayName() }}</span>
<span class="line_separator"></span>
</td>
<td>
{% if choice.getParticipant().getCanAgree() %}
{% if choice.getAgreement() == true %}