mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-08-24 00:23:50 +00:00
Merge branch 'master' into 110_extend_thirdparty
This commit is contained in:
@@ -52,7 +52,9 @@
|
||||
{% endmacro label %}
|
||||
|
||||
{%- if render == 'raw' -%}
|
||||
{{ _self.raw(thirdparty, options) }}
|
||||
<span class="entity-raw">
|
||||
{{ _self.raw(thirdparty, options) }}
|
||||
</span>
|
||||
{%- endif -%}
|
||||
|
||||
{%- if render == 'label' -%}
|
||||
@@ -64,7 +66,7 @@
|
||||
<div class="item-col">
|
||||
{{ _self.label(thirdparty, options) }}
|
||||
</div>
|
||||
<div class="item-col">
|
||||
<div class="item-col separator">
|
||||
<ul class="list-content fa-ul">
|
||||
{{ thirdparty.getAddress|chill_entity_render_box({
|
||||
'render': 'list',
|
||||
@@ -90,14 +92,16 @@
|
||||
{{ options['customButtons']['before'] }}
|
||||
{% endif %}
|
||||
|
||||
{%- if options['customButtons']['replace'] is not defined and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%}
|
||||
{% if options['customButtons']['replace'] is defined %}
|
||||
{{ options['customButtons']['replace'] }}
|
||||
{% elseif is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) %}
|
||||
<li>
|
||||
<a class="btn btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
|
||||
<a class="btn btn-sm btn-show" target="_blank" title="{{ 'Show thirdparty'|trans }}"
|
||||
href="{{ path('chill_3party_3party_show', { thirdparty_id: thirdparty.id }) }}"></a>
|
||||
</li>
|
||||
{%- else -%}
|
||||
{{ options['customButtons']['replace'] }}
|
||||
{%- endif -%}
|
||||
{% else %}
|
||||
{# rien faire ? j'ai eu un bug car options['customButtons'] était vide (marc) #}
|
||||
{% endif %}
|
||||
|
||||
{% if options['customButtons']['after'] is defined %}
|
||||
{{ options['customButtons']['after'] }}
|
||||
|
Reference in New Issue
Block a user