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

Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-04 17:55:16 +01:00
parent c7d0d78658 30e4b37888
commit 0688a9f58a
17 changed files with 286 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/web/prod/preview/short_history.html
View File

@@ -3,7 +3,7 @@
{% for hour, sites in record.get_short_history() %}
{% for site, actions in sites %}
{% for action, users in actions %}
{% for current_user, done in users %}
{% for done in users %}
<div style="margin:3px 0">
@@ -55,9 +55,9 @@
{% endif %}
<span class="actor">
{% if user.ACL().has_right_on_base(record.get_base_id(), 'canreport') %}
{% set user_infos = user.getInfos(current_user) %}
{% if current_user != session.get_usr_id() and user_infos %}
{% trans %}report:: par {{user_infos}}{% endtrans %}
{% if done['user'].get_id() != session.get_usr_id() %}
{% set user_infos = done['user'].get_display_name() %}
{% trans %}report:: par {{ user_infos }}{% endtrans %}
{% endif %}
{% endif %}