Merge 4.0 branch

This commit is contained in:
Thibaud Fabre
2016-12-05 17:04:54 +01:00
158 changed files with 5378 additions and 1530 deletions

View File

@@ -79,7 +79,7 @@
<div class="right_column_wrapper caption right_column_wrapper_caption PNB">
<div id="record_infos" class="PNB">
<div class="lightbox_container PNB">
{% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(first_item.getRecord(app).get_base_id(), 'canmodifrecord') %}
{% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(first_item.getRecord(app).get_base_id(), constant('\\ACL::CANMODIFRECORD')) %}
{% if first_item %}
{{macro.caption(first_item.getRecord(app), business, false, true)}}
{% endif %}