diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index 83d8cbcdb..8efdd0148 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -15,16 +15,13 @@
- {% if activity.date %}

{{ activity.date|format_date('short') }}

{% endif %} -
-

@@ -35,7 +32,6 @@ {% endif %}

-
@@ -131,21 +127,26 @@ {% endif %} - {# SEULEMENT SI DÉTAILLÉ - {% if activity.comment.comment is not empty %} -
-
-

{{ 'Comment'|trans }}

+ {# Only if ACL SEE_DETAILS AND/OR only on template SHOW ?? + durationTime + travelTime + comment + {% if activity.comment.comment is not empty and is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %} +
+
+

{{ 'Comment'|trans }}

+
+
+ {{ activity.comment|chill_entity_render_box({ + 'disable_markdown': false, + 'limit_lines': 3, + 'metadata': false + }) }} +
-
- {{ activity.comment|chill_entity_render_box({ - 'disable_markdown': false, - 'limit_lines': 3, - 'metadata': false - }) }} -
-
- {% endif %} + {% endif %} + documents + attendee #}
@@ -153,29 +154,49 @@
diff --git a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php index 30e8f2c06..6d38c789c 100644 --- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php +++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php @@ -92,6 +92,8 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn public function getRoles(): array { return [ + self::SEE, + self::SEE_DETAILS, self::CREATE_PERSON, self::CREATE_ACCOMPANYING_COURSE, self::UPDATE,