diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig index 4102f8a21..71755cc11 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_view_content.html.twig @@ -49,7 +49,10 @@ {{ 'Merge'|trans }} + class="btn btn-misc"> + + {{ 'Merge'|trans }} + {% endblock %} {% block content_view_actions_edit_link %} diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig index 4c56dfa54..0883f0a91 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig @@ -161,7 +161,13 @@ - {% else %} + {% elseif is_granted('CHILL_3PARTY_3PARTY_UPDATE', thirdparty) %} +
{{ 'thirdparty_duplicate.Thirdparty to delete'|trans }}: @@ -41,9 +41,9 @@
{{ 'thirdparty_duplicate.Thirdparty to keep'|trans }}: - {{ 'thirdparty_duplicate.Thirdparty to delete explanation'|trans }} + {{ 'thirdparty_duplicate.Thirdparty to keep explanation'|trans }}