jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

explain limited access if project or customer has team permission (#2006)

Browse Source
This commit is contained in:
Kevin Papst
2020-10-01 19:16:31 +02:00
committed by GitHub
parent cafd84cee4
commit 0aa6baea2f
5 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/activity/details.html.twig
View File

@@ -90,6 +90,9 @@
{% if is_granted('permissions', activity) %}
{% set options = options|merge({'route_create': path('activity_team_create', {'id': activity.id}), 'route_edit': path('admin_activity_permissions', {'id': activity.id})}) %}
{% endif %}
{% if activity.project is not null and (activity.project.teams|length > 0 or activity.project.customer.teams|length > 0) %}
{% set options = options|merge({'empty_message': 'team.activity_visibility_inherited'}) %}
{% endif %}
{{ include('embeds/teams.html.twig', options) }}
{% endif %}

2
templates/timesheet/layout-listing.html.twig
View File

@@ -41,7 +41,7 @@
}) %}
{% for field in metaColumns %}
{% set columns = columns|merge({
('mf_' ~ field.name): {'title': field.label, 'class': 'hidden-xs hidden-sm', 'orderBy': false}
('mf_' ~ field.name): {'title': field.label|trans, 'class': 'hidden-xs hidden-sm', 'orderBy': false}
}) %}
{% endfor %}
{% set columns = columns|merge({