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

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-06-19 16:11:27 +02:00
parent a8da584666
commit 1250f8ab0b
60 changed files with 880 additions and 2417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/prod/preview/caption.html.twig
View File

@@ -13,7 +13,7 @@
</div>
{% set business = app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'canmodifrecord') %}
{% if record.is_from_reg() %}
{{caption.format_caption(record, '', null, null, business, false, true)}}
{{macro.format_caption(record, '', null, null, business, false, true)}}
{% else %}
{{caption.format_caption(record, highlight, searchEngine, searchOptions, business, false, true)}}
{{macro.format_caption(record, highlight, searchEngine, business, false, true)}}
{% endif %}