hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 4.0 branch

Browse Source
This commit is contained in:
Thibaud Fabre
2016-12-05 17:04:54 +01:00
parent b5bbb1851f b84c35ff66
commit 97f2e66698
158 changed files with 5378 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/common/menubar.html.twig
View File

@@ -87,7 +87,7 @@
</li>
{% endif %}
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right('order_master') %}
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
<li>
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
<span>