Add highlights query

This commit is contained in:
Nicolas Le Goff
2014-12-29 15:06:45 +01:00
committed by Benoît Burnichon
parent 1ef4c1300d
commit 2d5a36f5a2
18 changed files with 120 additions and 41 deletions

View File

@@ -1,20 +1,21 @@
{% import 'common/macros.html.twig' as macro %}
{% set business = false %}
{% if app['authentication'].getUser() is not none %}
{% set business = app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'canmodifrecord') %}
{% endif %}
{% set business = granted_on_collection(record.baseId, 'canmodifrecord') %}
{% set display_exif = true %}
{% if view == 'answer' %}
{{ macro.format_caption(record, highlight|default(''), searchEngine|default(null), business, false, true) }}
{{ macro.caption(record, business, display_exif) }}
{% elseif view == 'lazaret' %}
{{ macro.format_caption(record, highlight|default(''), searchEngine|default(null), business, true, true) }}
{{ macro.caption(record, business, display_exif) }}
{% elseif view == 'preview' %}
{{ macro.format_caption(record, highlight|default(''), searchEngine|default(null), business, true, false) }}
{% set display_exif = false %}
{{ macro.caption(record, business, display_exif) }}
{% elseif view == 'basket' %}
{{ macro.format_caption(record, highlight|default(''), searchEngine|default(null), business, true, false) }}
{% set display_exif = false %}
{{ macro.caption(record, business, display_exif) }}
{% elseif view == 'overview' %}
{{ macro.format_caption(record, highlight|default(''), searchEngine|default(null), business, false, false) }}
{% set display_exif = false %}
{{ macro.caption(record, business, display_exif) }}
{% elseif view == 'publi' %}
{{ macro.format_caption(record, '', null, business, true, true) }}
{{ macro.caption(record, business, display_exif) }}
{% endif %}

View File

@@ -116,19 +116,15 @@
{% endif %}
{% endmacro %}
{% macro caption(record, business, technical) %}
{% macro caption(record, can_see_business, display_exif) %}
{# @todo handle business fields #}
{% for name, value in record.caption %}
<div class="desc {{ loop.index is odd ? 'impair' : 'pair' }}">
<div class="desc">
<b>{{ name }}</b> :
{% if value is iterable %}
{{ value | join(' ; ') }}
{% else %}
{{ value }}
{% endif %}
{{ caption_field(record, name, value)|e|highlight }}
</div>
{% endfor %}
{% if technical|default(true) and app['authentication'].user is not none and user_setting('technical_display') == 'group' %}
{% if display_exif|default(true) and app['authentication'].user is not none and user_setting('technical_display') == 'group' %}
<hr/>
{% include 'common/technical_datas.html.twig' %}
{% endif %}