Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/1.7' into 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Banin committed Jul 29, 2015
2 parents 0db87a7 + 2c96527 commit 9c8f230
Showing 1 changed file with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
{% set gridName = 'orocrm-email-campaign-grid' %}

{% block navButtons %}
{% if resource_granted('orocrm_email_campaign_create') %}
{{ UI.addButton({
'path': path('orocrm_email_campaign_create'),
'entity_label': 'orocrm.campaign.emailcampaign.entity_label'|trans
}) }}
{% endif %}
<div class="btn-group">
{% if resource_granted('orocrm_email_campaign_create') %}
{{ UI.addButton({
'path': path('orocrm_email_campaign_create'),
'entity_label': 'orocrm.campaign.emailcampaign.entity_label'|trans
}) }}
{% endif %}
</div>
{% endblock %}

0 comments on commit 9c8f230

Please sign in to comment.