diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index 296b4620f..906a28d78 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -113,24 +113,26 @@ - {# TOOD - {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} - #} -
  • - -
  • - {# TOOD - {% endif %} - {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} - #} -
  • - -
  • - {# + {% if no_action is not defined or no_action == false %} + {# TODO + {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} + #} +
  • + +
  • + {# TODO + {% endif %} + {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} + #} +
  • + +
  • + {# TODO + {% endif %} + #} {% endif %} - #} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index a0c4d30bb..e28de8b0e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -169,7 +169,7 @@

    {{ 'Activity list' |trans }}

    - {% include 'ChillActivityBundle:Activity:list.html.twig' with { 'context': 'accompanyingCourse' } %} + {% include 'ChillActivityBundle:Activity:list.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %} {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig index bdad9ce86..45f514f4d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig @@ -18,13 +18,13 @@
  • - {{ 'Create an accompanying period'|trans }}
  • - {# disable dropdown + {# Disabled dropdown