hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +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

4
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -48,7 +48,7 @@
data-kind="basket" data-id="{{basket.getId()}}">{{ 'action::exporter' | trans }}
</div>
</div>
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right('modifyrecord') %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %}
<div title="" class="context-menu-item menu3-custom-item">
<div data-kind="basket" data-id="{{basket.getId()}}"
class="context-menu-item-inner edit-record-action">{{ 'edit' | trans }}
@@ -228,7 +228,7 @@
data-kind="record" data-id="{{story.getRecord(app).get_serialize_key()}}">{{ 'action::exporter' | trans }}
</div>
</div>
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right('modifyrecord') %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANMODIFRECORD')) %}
<div title="" class="context-menu-item menu3-custom-item">
<div class="context-menu-item-inner edit-record-action"
data-kind="record" data-id="{{story.getRecord(app).get_serialize_key()}}"