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

1
src/Form/Toolbar/ActivityToolbarForm.php
View File

@@ -37,6 +37,7 @@ class ActivityToolbarForm extends AbstractToolbarForm
'yes' => 1, 'yes' => 1,
'no' => 0, 'no' => 0,
], ],
'search' => false,
'placeholder' => null, 'placeholder' => null,
'required' => false, 'required' => false,
'label' => 'label.globalsOnly', 'label' => 'label.globalsOnly',

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

@@ -90,6 +90,9 @@
{% if is_granted('permissions', activity) %} {% 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})}) %} {% set options = options|merge({'route_create': path('activity_team_create', {'id': activity.id}), 'route_edit': path('admin_activity_permissions', {'id': activity.id})}) %}
{% endif %} {% 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) }} {{ include('embeds/teams.html.twig', options) }}
{% endif %} {% endif %}

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

@@ -41,7 +41,7 @@
}) %} }) %}
{% for field in metaColumns %} {% for field in metaColumns %}
{% set columns = columns|merge({ {% 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 %} {% endfor %}
{% set columns = columns|merge({ {% set columns = columns|merge({

4
translations/teams.de.xlf
View File

@@ -26,6 +26,10 @@
<source>team.project_visibility_inherited</source> <source>team.project_visibility_inherited</source>
<target>Das Projekt ist nur eingeschränkt sichtbar, da Team Berechtigungen für den Kunden gesetzt sind.</target> <target>Das Projekt ist nur eingeschränkt sichtbar, da Team Berechtigungen für den Kunden gesetzt sind.</target>
</trans-unit> </trans-unit>
<trans-unit id="team.activity_visibility_inherited">
<source>team.activity_visibility_inherited</source>
<target>Die Tätigkeit ist nur eingeschränkt sichtbar, da Team Berechtigungen für das Projekt und/oder den Kunden gesetzt sind.</target>
</trans-unit>
<trans-unit id="team.create_default" approved="yes"> <trans-unit id="team.create_default" approved="yes">
<source>team.create_default</source> <source>team.create_default</source>
<target>Erstelle ein neues Team um den Zugriff zu beschränken</target> <target>Erstelle ein neues Team um den Zugriff zu beschränken</target>

4
translations/teams.en.xlf
View File

@@ -26,6 +26,10 @@
<source>team.project_visibility_inherited</source> <source>team.project_visibility_inherited</source>
<target>The project has limited access, because team permissions are set for the customer.</target> <target>The project has limited access, because team permissions are set for the customer.</target>
</trans-unit> </trans-unit>
<trans-unit id="team.activity_visibility_inherited">
<source>team.activity_visibility_inherited</source>
<target>The activity has limited access, because team permissions are set for the project and/or customer.</target>
</trans-unit>
<trans-unit id="team.create_default"> <trans-unit id="team.create_default">
<source>team.create_default</source> <source>team.create_default</source>
<target>Create a new team to limit access</target> <target>Create a new team to limit access</target>