Rights added to links in twig templates

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -15,13 +15,19 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
 
-    protected TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -109,9 +109,11 @@
             {{ 'Cancel'|trans }}
         </a>
     </li>
+    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
         <li>
             <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
         </li>
+    {% endif %}
 </ul>
 
 {{ form_end(edit_form) }}

src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php

@@ -16,17 +16,29 @@ use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    public AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    public $authorizationChecker;
 
-    public CountNotificationTask $counter;
+    /**
+     * @var CountNotificationTask
+     */
+    public $counter;
 
-    public TokenStorageInterface $tokenStorage;
+    /**
+     * @var TokenStorageInterface
+     */
+    public $tokenStorage;
 
-    public TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    public $translator;
 
     public function __construct(
         CountNotificationTask $counter,

src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -14,18 +14,14 @@ namespace Chill\CalendarBundle\Menu;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
     protected AuthorizationHelper $authorizationHelper;
 
-    protected Security $security;
-
     protected TokenStorageInterface $tokenStorage;
 
     protected TranslatorInterface $translator;
@@ -33,13 +29,11 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
     public function __construct(
         TokenStorageInterface $tokenStorage,
         AuthorizationHelper $authorizationHelper,
-        TranslatorInterface $translator,
+        TranslatorInterface $translator
-        Security $security
     ) {
         $this->translator = $translator;
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
-        $this->security = $security;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
@@ -47,7 +41,6 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         $period = $parameters['accompanyingCourse'];
 
         if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
-            if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $period)) {
             $menu->addChild($this->translator->trans('Calendar'), [
                 'route' => 'chill_calendar_calendar_list',
                 'routeParameters' => [
@@ -56,7 +49,6 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                 ->setExtras(['order' => 35]);
         }
     }
-    }
 
     public static function getMenuIds(): array
     {

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig

@@ -41,9 +41,12 @@
                 </a>
             </li>
         {% endif %}
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
             <li>
                 {{ m.download_button(document.object, document.title) }}
             </li>
+        {% endif %}
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
             <li>
             {% if chill_document_is_editable(document.object) %}
                 {% if not freezed %}
@@ -54,11 +57,12 @@
                     </a>
                 {% endif %}
             {% endif %}
+            </li>
+        {% endif %}
         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
             <li>
                 <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': document.course.id, 'id': document.id}) }}" class="btn btn-show"></a>
             </li>
         {% endif %}
-        </li>
     </ul>
 {% endif %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig

@@ -25,9 +25,11 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
+		{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
 			<li class="edit">
 				<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
 			</li>
+		{% endif %}
 	</ul>
 
 	{{ form_end(form) }}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig

@@ -42,9 +42,11 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
             <li class="edit">
                 <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
             </li>
+        {% endif %}
         {# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
             <li class="delete">
                 {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig

@@ -46,9 +46,11 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
+		{% if is_granted ('CHILL_PERSON_DOCUMENT_CREATE', person) %}
 			<li class="create">
 				<button class="btn btn-create">{{ 'Create'|trans }}</button>
 			</li>
+		{% endif %}
 	</ul>
 	{{ form_end(form) }}
 {% endblock %}

src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php

@@ -15,13 +15,19 @@ use Chill\AMLI\FamilyMembersBundle\Security\Voter\FamilyMemberVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
 
-    protected TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php

@@ -12,23 +12,11 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class LocationMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
-    private AuthorizationCheckerInterface $authorizationChecker;
-
-    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
-    {
-        $this->authorizationChecker = $authorizationChecker;
-    }
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
-            return;
-        }
-
         $menu->addChild('Location type list', [
             'route' => 'chill_crud_main_location_type_index',
         ])->setExtras(['order' => 205]);

src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php

@@ -12,23 +12,11 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Routing\MenuBuilder;
 
 use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
 class PermissionMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
-    private AuthorizationCheckerInterface $authorizationChecker;
-
-    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
-    {
-        $this->authorizationChecker = $authorizationChecker;
-    }
-
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
-            return;
-        }
-
         $menu->addChild('Permissions group list', [
             'route' => 'admin_permissionsgroup',
         ])->setExtras([

src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php

@@ -15,16 +15,22 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Class SectionMenuBuilder.
  */
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
 
-    protected TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     /**
      * SectionMenuBuilder constructor.
@@ -40,7 +46,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
      */
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if (!$this->authorizationChecker->isGranted('ROLE_USER')) {
         $menu->addChild($this->translator->trans('Homepage'), [
             'route' => 'chill_main_homepage',
         ])
@@ -57,7 +62,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 10,
                 ]
             );
-        }
 
         if ($this->authorizationChecker->isGranted(ChillExportVoter::EXPORT)) {
             $menu->addChild($this->translator->trans('Export Menu'), [

src/Bundle/ChillMainBundle/Routing/MenuBuilder/UserMenuBuilder.php

@@ -15,14 +15,11 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\Counter\NotificationByUserCounter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Workflow\Counter\WorkflowByUserCounter;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    private AuthorizationCheckerInterface $authorizationChecker;
-
     private NotificationByUserCounter $notificationByUserCounter;
 
     private Security $security;
@@ -35,22 +32,16 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         NotificationByUserCounter $notificationByUserCounter,
         WorkflowByUserCounter $workflowByUserCounter,
         Security $security,
-        TranslatorInterface $translator,
+        TranslatorInterface $translator
-        AuthorizationCheckerInterface $authorizationChecker
     ) {
         $this->notificationByUserCounter = $notificationByUserCounter;
         $this->workflowByUserCounter = $workflowByUserCounter;
         $this->security = $security;
         $this->translator = $translator;
-        $this->authorizationChecker = $authorizationChecker;
     }
 
     public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters)
     {
-        if (!$this->authorizationChecker->isGranted('ROLE_USER')) {
-            return;
-        }
-
         $user = $this->security->getUser();
 
         if ($user instanceof User) {

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -19,7 +19,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\HouseholdMemberType;
 use Chill\PersonBundle\Household\MembersEditor;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
-use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\Request;
@@ -27,7 +26,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Serializer\Exception;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 use function count;
 
@@ -57,7 +56,7 @@ class HouseholdMemberController extends ApiController
      */
     public function editMembership(Request $request, HouseholdMember $member): Response
     {
-        $this->denyAccessUnlessGranted(HouseholdVoter::EDIT, $member);
+        // TODO ACL
 
         $form = $this->createForm(HouseholdMemberType::class, $member, [
             'validation_groups' => ['household_memberships'],

src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php

@@ -30,7 +30,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/person/accompanying-periods/my", name="chill_person_accompanying_period_user")
+     * @Route("/{_locale}/accompanying-periods", name="chill_person_accompanying_period_user")
      */
     public function listAction(Request $request)
     {
@@ -50,7 +50,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
+     * @Route("/{_locale}/accompanying-periods/drafts", name="chill_person_accompanying_period_draft_user")
      */
     public function listDraftsAction(Request $request)
     {

src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -29,7 +29,10 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 
     protected Security $security;
 
-    protected TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     public function __construct(TranslatorInterface $translator, Registry $registry, Security $security)
     {
@@ -43,14 +46,12 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         /** @var AccompanyingPeriod $period */
         $period = $parameters['accompanyingCourse'];
 
-        if ($this->security->isGranted(AccompanyingPeriodVoter::SEE, $period)) {
         $menu->addChild($this->translator->trans('Resume Accompanying Course'), [
             'route' => 'chill_person_accompanying_course_index',
             'routeParameters' => [
                 'accompanying_period_id' => $period->getId(),
             ], ])
             ->setExtras(['order' => 10]);
-        }
 
         if ($this->security->isGranted(AccompanyingPeriodVoter::EDIT, $period)) {
             $menu->addChild($this->translator->trans('Edit Accompanying Course'), [
@@ -93,7 +94,6 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 
         $workflow = $this->registry->get($period, 'accompanying_period_lifecycle');
 
-        if ($this->security->isGranted(AccompanyingPeriodVoter::EDIT, $period)) {
         if (null !== $period->getClosingDate()) {
             $menu->addChild($this->translator->trans('Re-open accompanying course'), [
                 'route' => 'chill_person_accompanying_course_reopen',
@@ -112,7 +112,6 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                 ->setExtras(['order' => 99999]);
         }
     }
-    }
 
     public static function getMenuIds(): array
     {

src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdMenuBuilder implements LocalMenuBuilderInterface
@@ -24,12 +22,9 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $translator;
 
-    private $security;
+    public function __construct(TranslatorInterface $translator)
-
-    public function __construct(TranslatorInterface $translator, Security $security)
     {
         $this->translator = $translator;
-        $this->security = $security;
     }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
@@ -37,7 +32,6 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
         /** @var \Chill\PersonBundle\Entity\Household\Household $household */
         $household = $parameters['household'];
 
-        if ($this->security->isGranted(HouseholdVoter::SEE, $household)) {
         $menu->addChild($this->translator->trans('household.Household summary'), [
             'route' => 'chill_person_household_summary',
             'routeParameters' => [
@@ -51,18 +45,14 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
                 'household_id' => $household->getId(),
             ], ])
             ->setExtras(['order' => 15]);
-        }
 
-        if ($this->security->isGranted(HouseholdVoter::EDIT, $household)) {
         $menu->addChild($this->translator->trans('household_composition.Compositions'), [
             'route' => 'chill_person_household_composition_index',
             'routeParameters' => [
                 'id' => $household->getId(),
             ], ])
             ->setExtras(['order' => 17]);
-        }
 
-        if ($this->security->isGranted(HouseholdVoter::SEE, $household)) {
         $menu->addChild($this->translator->trans('household.Accompanying period'), [
             'route' => 'chill_person_household_accompanying_period',
             'routeParameters' => [
@@ -77,7 +67,6 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
             ], ])
             ->setExtras(['order' => 30]);
     }
-    }
 
     public static function getMenuIds(): array
     {

src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php

@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Security\Core\Security;
@@ -34,7 +33,10 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
      */
     protected $showAccompanyingPeriod;
 
-    protected TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     private Security $security;
 
@@ -50,7 +52,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        if ($this->security->isGranted(PersonVoter::SEE, $parameters['person'])) {
         $menu->addChild($this->translator->trans('Person details'), [
             'route' => 'chill_person_view',
             'routeParameters' => [
@@ -60,6 +61,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ->setExtras([
                 'order' => 50,
             ]);
+
         $menu->addChild($this->translator->trans('Residential addresses'), [
             'route' => 'chill_person_residential_address_list',
             'routeParameters' => [
@@ -89,7 +91,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ->setExtras([
                 'order' => 99999,
             ]);
-        }
 
         if (
             'visible' === $this->showAccompanyingPeriod
@@ -106,7 +107,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                 ]);
         }
 
-        if ($this->security->isGranted(PersonVoter::SEE, $parameters['person'])) {
         $menu->addChild($this->translator->trans('person_resources_menu'), [
             'route' => 'chill_person_resource_list',
             'routeParameters' => [
@@ -117,7 +117,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                 'order' => 99999,
             ]);
     }
-    }
 
     public static function getMenuIds(): array
     {

src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php

@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -57,7 +56,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 ]);
         }
 
-        if ($this->authorizationChecker->isGranted(AccompanyingPeriodVoter::CREATE)) {
         $menu->addChild($this->translator->trans('Create an accompanying course'), [
             'route' => 'chill_person_accompanying_course_new',
         ])
@@ -66,7 +64,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 'icons' => ['plus'],
             ]);
     }
-    }
 
     public static function getMenuIds(): array
     {

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -71,7 +71,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
         return $qb->select('a')
-            ->addOrderBy('userHistory.startDate', 'DESC')
+            ->distinct(true)
             ->getQuery()
             ->setMaxResults($limit)
             ->setFirstResult($offset)
@@ -95,7 +95,6 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb
             ->join('a.userHistories', 'userHistory')
             ->where($qb->expr()->eq('a.user', ':user'))
-            ->andWhere($qb->expr()->neq('a.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
             ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
             ->andWhere($qb->expr()->isNull('userHistory.endDate'))
             ->setParameter('user', $user)

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/Comment/index.html.twig

@@ -46,8 +46,10 @@
                 {% if type == 'new' %}
                     <button class="btn btn-create" type="submit">{{ 'Post a new comment'|trans }}</button>
                 {% elseif type == 'edit' %}
+                    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_COMMENT_EDIT', comment) %}
                         <button class="btn btn-save" type="submit">{{ 'Save'|trans }}</button>
                     {% endif %}
+                {% endif %}
                 </li>
             </ul>
             {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig

@@ -11,6 +11,6 @@
                 </li>
             </ul>
         </div>
-        {{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}
+        {{ 'Some people currently do not belong to any household. Add them to a household soon'|trans }}
     </div></div>
 </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig

@@ -15,10 +15,10 @@
                 </ul>
             </div>
                 <p>
-            {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}</p>
+            {{ 'This course is located at a temporary address. You should link this course to a user'|trans }}</p>
             {% if not hasPersonLocation %}
                 <p>
-                {{ 'Associate at least one member with an household, and set an address to this household'|trans }}</p>
+                {{ 'Associate at least one member with a household, and set an address to this household'|trans }}</p>
             {% endif %}
         </div>
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/close.html.twig

@@ -21,9 +21,11 @@
                     {{ 'Return'|trans }}
                 </a>
             </li>
+            {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
                 <li>
                     <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
                 </li>
+            {% endif %}
         </ul>
 
     {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/re_open.html.twig

@@ -20,6 +20,7 @@
                     {{ 'Return'|trans }}
                 </a>
             </li>
+            {# TODO: add a right here? Use 'CHILL_ACCOMPANYING_PERIOD_CREATE'? #}
             <li>
                 <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
             </li>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -108,6 +108,7 @@
 
         {% if displayAction is defined and displayAction == true %}
             <div class="item-col">
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w) %}
                 <ul class="record_actions">
                         <li>
                             <a class="btn btn-edit" title="{{ 'Edit'|trans }}"
@@ -120,6 +121,7 @@
                         ></a>
                     </li>
                 </ul>
+                {% endif %}
             </div>
         {% endif %}
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig

@@ -9,10 +9,12 @@
 
         {% if works|length == 0 %}
             <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE', accompanyingCourse) %}
                     <a class="btn btn-sm btn-create"
                         title="{{ 'accompanying_course_work.create'|trans }}"
                         href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
                     ></a>
+                {% endif %}
             </p>
 
         {% else %}
@@ -26,12 +28,14 @@
         {{ chill_pagination(paginator) }}
 
         <ul class="record_actions sticky-form-buttons">
+            {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE', accompanyingCourse) %}
                 <li>
                     <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_new', { 'id': accompanyingCourse.id }) }}"
                         class="btn btn-new">
                         {{ 'accompanying_course_work.create'|trans }}
                     </a>
                 </li>
+            {% endif %}
         </ul>
 
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig

@@ -5,17 +5,21 @@
 
 {% macro recordAction(period, contextEntity) %}
     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS', period) %}
         <li>
             <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
             class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
         </li>
+    {% endif %}
     {% if period.step == 'DRAFT' and contextEntity.type == 'person' %}
+        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE', period) %}
             {% set person = contextEntity.entity %}
             <li>
                 <a href="{{ path('chill_person_accompanying_course_delete', { 'accompanying_period_id': period.id, 'person_id' : person.id }) }}"
                 class="btn btn-delete" title="{{ 'Delete accompanying period'|trans }}">{# {{ 'Delete this period'|trans }} #}</a>
             </li>
         {% endif %}
+    {% endif %}
 
     {# DISABLED if new accompanying course, this is not necessary
     {% if person is defined %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig

@@ -12,11 +12,14 @@
     {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
+        {% if is_granted('CHILL_PERSON_SEE', person) %}
             <li class="cancel">
                 <a href="{{ path ('chill_person_view', {'person_id' : person.id } ) }}"
                 class="btn btn-cancel">{{ 'Person details'|trans }}
                 </a>
             </li>
+        {% endif %}
+        {# TODO: which right to add here? #}
             <li>
                 <a class="btn btn-create"
                 href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button">
@@ -24,6 +27,7 @@
                 </a>
             </li>
 
+        {# TODO: should this commented section be deleted? #}
         {#  Disabled dropdown
         <li class="dropdown">
             <a class="btn btn-create change-icon dropdown-toggle"

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig

@@ -16,6 +16,7 @@
                 {{ 'Cancel'|trans }}
             </a>
         </li>
+        {# TODO: add a right here? Use 'CHILL_ACCOMPANYING_PERIOD_CREATE'? #}
         <li>
             <a href="{{ path('chill_person_accompanying_period_re_open', {'confirm' : true, 'person_id' : person.id, 'period_id' : period.id } ) }}" class="btn btn-create">
                 {{'Confirm'|trans }}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_draft_periods_list.html.twig

@@ -5,10 +5,12 @@
 {% block title %}{{ 'My accompanying periods in draft'|trans }}{% endblock title %}
 
 {% macro recordAction(period) %}
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS', period) %}
         <li>
             <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
             class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
         </li>
+    {% endif %}
 {% endmacro %}
 
 

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig

@@ -5,10 +5,12 @@
 {% block title %}{{ 'My accompanying periods'|trans }}{% endblock title %}
 
 {% macro recordAction(period) %}
+    {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', period) %}
         <li>
             <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': period.id }) }}"
             class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
         </li>
+    {% endif %}
 {% endmacro %}
 
 
@@ -20,8 +22,6 @@
         <div class="flex-table accompanyingcourse-list">
             {% for period in accompanyingPeriods %}
                 {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %}
-            {% else %}
-                <p class="chill-no-data-statement">{{ 'Any accompanying period'|trans }}</p>
             {% endfor %}
         </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/_render_member.html.twig

@@ -29,13 +29,13 @@
                             {% if customButtons['before'] is defined %}
                                 {{ customButtons['before'] }}
                             {% endif %}
-
+                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', member.household) %}
                                 <li>
                                     <a  class="btn btn-sm btn-edit"
                                         title="{{ 'household.Edit member household'|trans }}"
                                         href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': member.id }) }}"></a>
                                 </li>
-
+                            {% endif %}
                             {% if customButtons['after'] is defined %}
                                 {{ customButtons['after'] }}
                             {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig

@@ -41,11 +41,13 @@
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
+        {% if is_granted('CHILL_PERSON_HOUSEHOLD_SEE', household) %}
             <li class="cancel">
                 <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">
                     {{ 'Household summary'|trans }}
                 </a>
             </li>
+        {% endif %}
         {#
         <li>
             <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="btn btn-create">

src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig

@@ -63,11 +63,13 @@
                     'has_no_address': true
                 }) }}
                 <ul class="record_actions">
+                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                     <li>
                         <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
                            class="btn btn-edit"></a>
 
                     </li>
+                {% endif %}
                 </ul>
             </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/edit_member_metadata.html.twig

@@ -26,11 +26,13 @@
       {{ 'Cancel'|trans }}
     </a>
   </li>
+  {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
     <li>
       <button type="submit" class="btn btn-save">
         {{ 'Save'|trans }}
       </button>
     </li>
+  {% endif %}
 </ul>
 
 {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -64,12 +64,14 @@
                                 {{ 'household_composition.Since'|trans({'startDate': currentComposition.startDate}) }}
                             </p>
                             <ul class="record_actions">
+                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                                 <li>
                                     <a class="btn btn-sm btn-update change-icon"
                                        href="{{ path('chill_person_household_composition_index', {'id': household.id}) }}">
                                         {{ 'household_composition.Update composition'|trans }}
                                     </a>
                                 </li>
+                            {% endif %}
                             </ul>
                         </div>
                     {% else %}
@@ -78,12 +80,14 @@
                                 {{ 'household_composition.Currently no composition'|trans }}
                             </p>
                                 <ul class="record_actions" style="margin-bottom: 0">
+                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                                     <li>
                                         <a class="btn btn-sm btn-update change-icon"
                                            href="{{ path('chill_person_household_composition_index', {'id': household.id}) }}">
                                             {{ 'household_composition.Add a composition'|trans }}
                                         </a>
                                     </li>
+                                {% endif %}
                                 </ul>
                         </div>
                     {% endif %}
@@ -105,16 +109,20 @@
                     {% endif %}
 
                     {% if not household.commentMembers.isEmpty() %}
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                             <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
                             class="btn btn-edit btn-block">
                                 {{ 'household.Edit comment and expecting birth'|trans }}
                             </a>
+                        {% endif %}
                     {% else %}
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                             <a href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
                             class="btn btn-create btn-block">
                                 {{ 'household.New comment and expecting birth'|trans }}
                             </a>
                         {% endif %}
+                    {% endif %}
 
                 {% else %}
 
@@ -129,11 +137,13 @@
                         {{ form_widget(form.commentMembers) }}
                     </div>
                     <ul class="record_actions">
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                             <li>
                                 <button type="submit" class="btn btn-save" id="form_household_comment_confirm">
                                     {{ 'Save'|trans }}
                                 </button>
                             </li>
+                        {% endif %}
                     </ul>
                     {{ form_end(form) }}
                 {% endif %}
@@ -245,12 +255,14 @@
 
 
     <ul class="record_actions">
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
         <li>
             <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
             class="btn btn-create">
             {{ 'household.Add a member'|trans }}
             </a>
         </li>
+      {% endif %}
     </ul>
 
 </div>

src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/index.html.twig

@@ -63,9 +63,11 @@
                         <li class="cancel" style="margin-right: auto;">
                             <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
                         </li>
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', c.household) %}
                             <li>
                                 <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
                             </li>
+                        {% endif %}
                     </ul>
                     {{ form_end(form) }}
                 {% endif %}
@@ -79,20 +81,24 @@
         {{ form_widget(form) }}
 
         <ul class="record_actions">
+            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                 <li>
                     <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
                 </li>
+            {% endif %}
         </ul>
         {{ form_end(form) }}
     </div>
 
     {% if editId == -1 %}
         <ul class="record_actions sticky-form-buttons">
+            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                 <li>
                     <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
                         {{ 'Create'|trans }}
                     </button>
                 </li>
+            {% endif %}
         </ul>
     {% endif %}
 </div>

src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig

@@ -107,10 +107,12 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
+            {% if is_granted('CHILL_PERSON_CREATE') %}
                 <a class="btn btn-create dropdown-toggle"
                 href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
                     {{ 'Add the person'|trans }}
                 </a>
+            {% endif %}
                 <ul class="dropdown-menu" aria-labelledby="newPersonMore">
                     <li>
                         {{ form_widget(form.editPerson, { 'attr': { 'class': 'dropdown-item' }}) }}
@@ -122,6 +124,7 @@
                         {{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
                     </li>
                 </ul>
+            {# {% endif %} #}
         </li>
     </ul>
 

src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig

@@ -136,11 +136,13 @@
                 {{ 'Return'|trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
             <li>
                 <button class="btn btn-save" type="submit">
                     {{ 'Save'|trans }}
                 </button>
             </li>
+        {% endif %}
     </ul>
     {{ form_end(form) }}
 

src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig

@@ -113,14 +113,18 @@
 
                         <div class="item-row separator">
                             <ul class="record_actions">
+                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_SEE', p.household) %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_household_summary',{ 'household_id': p.household.id }) }}"
                                     class="btn btn-show" title="{{ 'Show'|trans }}"></a>
                                 </li>
+                                {% endif %}
+                                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
                                     class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
                                 </li>
+                                {% endif %}
                                 {% if p.isCurrent() %}
                                     <li>
                                         <a class="btn btn-misc" href="{{ chill_path_add_return_path( 'chill_person_household_members_editor', { 'persons': [ person.id ], 'allow_leave_without_household': true }) }}">
@@ -164,10 +168,12 @@
 
                     <div class="item-row separator">
                         <ul class="record_actions">
+                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
                                 <li>
                                     <a href="{{ chill_path_add_return_path('chill_person_household_member_edit', { id: p.id }) }}"
                                     class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
                                 </li>
+                            {% endif %}
                         </ul>
                     </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Person/list.html.twig

@@ -69,7 +69,9 @@
                         </td>
                         <td>
                             <ul class="record_actions">
+                                {% if is_granted('CHILL_PERSON_SEE', person) %}
                                     <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% endif %}
                                 {% if is_granted('CHILL_PERSON_UPDATE', person) %}
                                 <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                                 {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Person/list_by_phonenumber.html.twig

@@ -74,7 +74,9 @@
                         </td>
                         <td>
                             <ul class="record_actions">
+                                {% if is_granted('CHILL_PERSON_SEE', person) %}
                                     <li><a class="btn btn-show" href="{{ path('chill_person_view', { person_id : person.getId }) }}"></a></li>
+                                {% endif %}
                                 {% if is_granted('CHILL_PERSON_UPDATE', person) %}
                                     <li><a class="btn btn-update" href="{{ path('chill_person_general_edit', { person_id : person.getId }) }}"></a></li>
                                 {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig

@@ -214,12 +214,14 @@
                                     {% endif %}
 
                                     <ul class="record_actions record_actions_column">
+                                        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', acp) %}
                                             <li>
                                                 <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
                                                 class="btn btn-sm btn-outline-primary" title="{{ 'See accompanying period'|trans }}">
                                                     <i class="fa fa-random fa-fw"></i>
                                                 </a>
                                             </li>
+                                        {% endif %}
                                     </ul>
 
                                 </div>

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig

@@ -20,9 +20,11 @@
                 {{ 'Return'|trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_PERSON_CREATE') %}
             <li>
                 <button class="btn btn-save" type="submit">{{ 'Next'|trans }}</button>
             </li>
+        {% endif %}
     </ul>
 
     {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig

@@ -56,9 +56,11 @@
                         </td>
                         <td>
                             <ul class="record_actions">
+                                {% if is_granted('CHILL_PERSON_SEE', duplicatePerson) %}
                                     <li>
                                         <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : duplicatePerson.id }) }}"></a>
                                     </li>
+                                {% endif %}
                                 <li>
                                     <a class="btn btn-action" href="{{ path('chill_person_duplicate_confirm', { person1_id : person.id, person2_id : duplicatePerson.id }) }}">
                                     <i class="fa fa-cog fa-fw"></i>{{ 'Merge'|trans }}</a>
@@ -124,9 +126,11 @@
                             </td>
                             <td>
                                 <ul class="record_actions">
+                                {% if is_granted('CHILL_PERSON_SEE', notDuplicatePerson) %}
                                     <li>
                                         <a class="btn btn-show" target="_blank" href="{{ path('chill_person_view', { person_id : notDuplicatePerson.id }) }}"></a>
                                     </li>
+                                {% endif %}
                                     <li>
                                         <a class="btn btn-misc" title="{{ 'Switch to duplicate'|trans }}"
                                             href="{{ path('chill_person_remove_duplicate_not_duplicate', {person1_id : person.id, person2_id : notDuplicatePerson.id}) }}">

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig

@@ -65,12 +65,14 @@
     </ul>
 {% else %}
     <ul class="record_actions">
+        {% if is_granted('CHILL_PERSON_UPDATE', person) %}
             <li>
                 <button class="btn btn-create"
                 type="submit" id="newPersonResource">
                     {{ 'Save'|trans }}
                 </button>
             </li>
+        {% endif %}
     </ul>
 {% endif %}
 

src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig

@@ -38,9 +38,11 @@
                     {{ 'Cancel'|trans|chill_return_path_label }}
                 </a>
             </li>
+            {% if is_granted('CHILL_PERSON_UPDATE', person) %}
                 <li>
                     <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
                 </li>
+            {% endif %}
         </ul>
 
         {{ form_end(form) }}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_evaluation_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                    {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_goal_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                    {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                 <ul class="record_actions">
                     <li>
                         <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                     </li>
                 </ul>
+                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_action_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig

@@ -14,11 +14,13 @@
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
+                {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', entity) %}
                     <ul class="record_actions">
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_crud_social_issue_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
                         </li>
                     </ul>
+                {% endif %}
                 </td>
             </tr>
         {% endfor %}

src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig

@@ -28,12 +28,10 @@ This view should receive those arguments:
 
 {% block personcontent %}
 <div class="timeline">
-            
     {{ timeline|raw }}
 
     {% if nb_items > paginator.getItemsPerPage %}
         {{ chill_pagination(paginator) }}
     {% endif %}
-    
 </div>
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig

@@ -6,6 +6,7 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
+    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', work) %}
         <ul class="record_actions">
             <li>
                 <a class="btn btn-update"
@@ -14,4 +15,5 @@
                 </a>
             </li>
         </ul>
+    {% endif %}
 {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig

@@ -88,7 +88,7 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
-    {# TODO add acl #}
+    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', evaluation.accompanyingPeriodWork) %}
         <ul class="record_actions">
             <li>
                 <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
@@ -96,4 +96,5 @@
                 </a>
             </li>
         </ul>
+    {% endif %}
 {% endif %}

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -213,7 +213,7 @@ No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Usagers concernés
 Referrer: Référent
-Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
+Some people currently do not belong to any household. Add them to a household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours
 course.draft: Brouillon
@@ -451,12 +451,12 @@ Edit Accompanying Course: Modifier le parcours
 Close Accompanying Course: Clôturer le parcours
 Create Accompanying Course: Créer un nouveau parcours
 Drop Accompanying Course: Supprimer le parcours
-This course is located at a temporarily address. You should locate this course to an user: Le parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'une personne concernée.
+This course is located at a temporary address. You should link this course to a user: Le parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'une personne concernée.
 Accompanying course location: Localisation du parcours
 This course is located by: Localisé auprès de
 This course has a temporarily location: Localisation temporaire
 Choose a person to locate by: Localiser auprès d'un usager concerné
-Associate at least one member with an household, and set an address to this household: Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.
+Associate at least one member with a household, and set an address to this household: Associez au moins un membre du parcours à un ménage, et indiquez une adresse à ce ménage.
 Locate by: Localiser auprès de
 fix it: Compléter
 accompanying_course:

src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php

@@ -16,13 +16,19 @@ use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Knp\Menu\MenuItem;
 use LogicException;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class MenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
 
-    protected TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php

@@ -15,13 +15,19 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class SectionMenuBuilder implements LocalMenuBuilderInterface
 {
-    public AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    public $authorizationChecker;
 
-    public TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    public $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,

src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php

@@ -17,17 +17,29 @@ use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    public AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    public $authorizationChecker;
 
-    public CountNotificationTask $counter;
+    /**
+     * @var CountNotificationTask
+     */
+    public $counter;
 
-    public TokenStorageInterface $tokenStorage;
+    /**
+     * @var TokenStorageInterface
+     */
+    public $tokenStorage;
 
-    public TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    public $translator;
 
     public function __construct(
         CountNotificationTask $counter,

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_edit.html.twig

@@ -19,9 +19,11 @@
 			<a class="btn btn-cancel" href={% if task.person is not null %}"{{ chill_return_path_or('chill_task_singletask_list', { 'person_id': task.person.id } ) }}"{% else %}"{{ chill_return_path_or('chill_task_singletask_courselist', {'course_id': task.course.id}) }}" {% endif %}>
 				{{ 'Cancel'|trans }}</a>
 		</li>
+		{% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
 			<li>
 				{{ form_widget(form.submit, { 'label': 'Save task', 'attr': {'class' : 'btn btn-update'}})}}
 			</li>
+		{% endif %}
 	</ul>
 	{{ form_end(form) }}
 </div>

src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php

@@ -15,16 +15,22 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 
 /**
  * Add an entry in section to go to third party index page.
  */
 class MenuBuilder implements LocalMenuBuilderInterface
 {
-    protected AuthorizationCheckerInterface $authorizationChecker;
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
 
-    protected TranslatorInterface $translator;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
 
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,