diff --git a/src/Form/Toolbar/ActivityToolbarForm.php b/src/Form/Toolbar/ActivityToolbarForm.php
index ed6067c5..fdee4716 100644
--- a/src/Form/Toolbar/ActivityToolbarForm.php
+++ b/src/Form/Toolbar/ActivityToolbarForm.php
@@ -37,6 +37,7 @@ class ActivityToolbarForm extends AbstractToolbarForm
'yes' => 1,
'no' => 0,
],
+ 'search' => false,
'placeholder' => null,
'required' => false,
'label' => 'label.globalsOnly',
diff --git a/templates/activity/details.html.twig b/templates/activity/details.html.twig
index 27a92187..a62b140c 100644
--- a/templates/activity/details.html.twig
+++ b/templates/activity/details.html.twig
@@ -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 %}
diff --git a/templates/timesheet/layout-listing.html.twig b/templates/timesheet/layout-listing.html.twig
index 4b8b1625..8a026115 100644
--- a/templates/timesheet/layout-listing.html.twig
+++ b/templates/timesheet/layout-listing.html.twig
@@ -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({
diff --git a/translations/teams.de.xlf b/translations/teams.de.xlf
index 1484b503..fe567ea9 100644
--- a/translations/teams.de.xlf
+++ b/translations/teams.de.xlf
@@ -26,6 +26,10 @@
team.project_visibility_inheritedDas Projekt ist nur eingeschränkt sichtbar, da Team Berechtigungen für den Kunden gesetzt sind.
+
+ team.activity_visibility_inherited
+ Die Tätigkeit ist nur eingeschränkt sichtbar, da Team Berechtigungen für das Projekt und/oder den Kunden gesetzt sind.
+ team.create_defaultErstelle ein neues Team um den Zugriff zu beschränken
diff --git a/translations/teams.en.xlf b/translations/teams.en.xlf
index ea8f55a5..21f2449d 100644
--- a/translations/teams.en.xlf
+++ b/translations/teams.en.xlf
@@ -26,6 +26,10 @@
team.project_visibility_inheritedThe project has limited access, because team permissions are set for the customer.
+
+ team.activity_visibility_inherited
+ The activity has limited access, because team permissions are set for the project and/or customer.
+ team.create_defaultCreate a new team to limit access