Fix caption display

This commit is contained in:
Nicolas Le Goff
2014-04-17 10:55:14 +02:00
parent 721fd9e909
commit ef6147ca30
15 changed files with 79 additions and 124 deletions

View File

@@ -1,4 +1,4 @@
{% import 'common/caption_templates/preview.html.twig' as caption %}
{% import 'common/macros.html.twig' as macro %}
{% if app['authentication'].getUser().ACL().has_right_on_base(record.get_base_id, 'canmodifrecord') %}
<div class="edit_button" style="text-align:right">
@@ -13,9 +13,7 @@
</div>
{% set business = app['authentication'].getUser().ACL().has_right_on_base(record.get_base_id(), 'canmodifrecord') %}
{% if record.is_from_reg() %}
{{caption.format_caption(record, '', null, business)}}
{{ macro.format_caption(record, '', null, business, false, true) }}
{% else %}
{{caption.format_caption(record, highlight, searchEngine, business)}}
{{ macro.format_caption(record, highlight, searchEngine, business, false, true) }}
{% endif %}
<hr style="margin:10px 0;"/>
{% include 'common/technical_datas.html.twig' %}