Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-24 00:23:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Julien Fastré
2020-05-01 15:54:12 +02:00
parent 320598e905 ad9e52810a
commit 278d7f5772
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/views/AccompanyingPeriod/list.html.twig
View File

@@ -28,7 +28,6 @@
'%opening_date%': accompanying_period.openingDate|localizeddate('long', 'none'),
'%closing_date%': accompanying_period.closingDate|localizeddate('long', 'none')}
) }}
<div>{{ accompanying_period.closingMotive|chill_entity_render_box }}</div>
{% endif %}
</td>
{% if chill_accompanying_periods.fields.user == 'visible' %}
@@ -41,6 +40,10 @@
</td>
{% endif %}
<td>
{% if accompanying_period.isOpen == false %}
<div>{{ accompanying_period.closingMotive|chill_entity_render_box }}</div>
<br/>
{% endif %}
{{ accompanying_period.remark|chill_print_or_message('No remark', 'blockquote') }}
</td>
<td>