FIX [documents][parcours] only show document menu entry when parcours is no longer draft

693 on doit utiliser le métier du référent, et pas le métier du parcours

See merge request Chill-Projet/chill-bundles!482

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

@@ -77,7 +77,7 @@ Choose a type: Choisir un type
 4 hours: 4 heures
 4 hours 30: 4 heures 30
 5 hours: 5 heures
-Concerned groups: Parties concernées
+Concerned groups: Parties concernées par l'échange
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
 Others persons: Usagers

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig

@@ -7,7 +7,7 @@
 
 <div id="mainUser"></div> {# <=== vue component: mainUser #}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
 
 {%- if form.persons is defined -%}
     {{ form_widget(form.persons) }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig

@@ -7,7 +7,7 @@
 
 <div id="mainUser"></div> {# <=== vue component: mainUser #}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
 
 {%- if form.mainUser is defined -%}
     {{ form_row(form.mainUser) }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig

@@ -14,7 +14,7 @@
     <dd>{{ entity.mainUser }}</dd>
 </dl>
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
 {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
 
 

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

@@ -4,7 +4,7 @@ My calendar list: Mes rendez-vous
 There is no calendar items.: Il n'y a pas de rendez-vous
 Remove calendar item: Supprimer le rendez-vous
 Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir supprimer le rendez-vous?
-Concerned groups: Parties concernées
+Concerned groups calendar: Parties concernées
 Calendar data: Données du rendez-vous
 Update calendar: Modifier le rendez-vous
 main user concerned: Utilisateur concerné

src/Bundle/ChillDocStoreBundle/Menu/MenuBuilder.php

@@ -14,6 +14,7 @@ namespace Chill\DocStoreBundle\Menu;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
 use LogicException;
 use Symfony\Component\Security\Core\Security;
@@ -60,7 +61,7 @@ final class MenuBuilder implements LocalMenuBuilderInterface
     {
         $course = $parameters['accompanyingCourse'];
 
-        if ($this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $course)) {
+        if ($this->security->isGranted(AccompanyingCourseDocumentVoter::SEE, $course) && !(AccompanyingPeriod::STEP_DRAFT === $course->getStep())) {
             $menu->addChild($this->translator->trans('Documents'), [
                 'route' => 'accompanying_course_document_index',
                 'routeParameters' => [

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

@@ -36,9 +36,9 @@
 
 	{{ chill_pagination(pagination) }}
 
+	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) and not accompanyingCourse.getStep() is same as('DRAFT') %}
 	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
 
-	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) %}
 		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">

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

@@ -56,9 +56,9 @@
 
 	{{ chill_pagination(pagination) }}
 
+	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
 	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\Person" data-entity-id="{{ person.id }}"></div>
 
-	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
 		<ul class="record_actions sticky-form-buttons">
 			<li class="create">
 				<a href="{{ path('person_document_new', {'person': person.id}) }}" class="btn btn-create">

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -248,6 +248,8 @@ class AccompanyingCourseController extends Controller
      */
     public function newAction(Request $request): Response
     {
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::CREATE);
+
         $period = new AccompanyingPeriod();
         $em = $this->getDoctrine()->getManager();
 

src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php

@@ -133,7 +133,7 @@ class HouseholdCompositionController extends AbstractController
      */
     public function index(Household $household, Request $request): Response
     {
-        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
             throw new AccessDeniedException('not allowed to edit a household');
         }
 

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -24,6 +24,7 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -123,7 +124,9 @@ class HouseholdController extends AbstractController
      */
     public function addressEdit(Request $request, Household $household)
     {
-        // TODO ACL
+        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
+            throw new AccessDeniedException('You are not allowed to edit a household address');
+        }
 
         $address_id = $request->query->get('address_id');
         $address = $this->getDoctrine()->getManager()
@@ -149,7 +152,9 @@ class HouseholdController extends AbstractController
      */
     public function addresses(Request $request, Household $household)
     {
-        // TODO ACL
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            throw new AccessDeniedException('You have no access to this household\'s details');
+        }
 
         //TODO put these lines into a validator constraint on household->getAddress
         $addresses = $household->getAddresses();
@@ -179,7 +184,9 @@ class HouseholdController extends AbstractController
      */
     public function addressMove(Request $request, Household $household)
     {
-        // TODO ACL
+        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
+            throw new AccessDeniedException('You are not allowed to edit this household');
+        }
 
         return $this->render(
             '@ChillPerson/Household/address_move.html.twig',
@@ -255,7 +262,10 @@ class HouseholdController extends AbstractController
      */
     public function editHouseholdMetadata(Request $request, Household $household)
     {
-        // TODO ACL
+        if (!$this->security->isGranted(HouseholdVoter::EDIT, $household)) {
+            throw new AccessDeniedException('not allowed to edit a household');
+        }
+
         $form = $this->createMetadataForm($household);
 
         $form->handleRequest($request);
@@ -311,7 +321,9 @@ class HouseholdController extends AbstractController
      */
     public function summary(Request $request, Household $household)
     {
-        // TODO ACL
+        if (!$this->security->isGranted(HouseholdVoter::SEE, $household)) {
+            throw new AccessDeniedException('not allowed to edit a household');
+        }
 
         $positions = $this->positionRepository
             ->findByActiveOrdered();

src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php

@@ -19,12 +19,15 @@ 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\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -38,14 +41,18 @@ class HouseholdMemberController extends ApiController
 
     private TranslatorInterface $translator;
 
+    private Security $security;
+
     public function __construct(
         UrlGeneratorInterface $generator,
         TranslatorInterface $translator,
-        AccompanyingPeriodRepository $periodRepository
+        AccompanyingPeriodRepository $periodRepository,
+        Security $security
     ) {
         $this->generator = $generator;
         $this->translator = $translator;
         $this->periodRepository = $periodRepository;
+        $this->security = $security;
     }
 
     /**
@@ -56,7 +63,9 @@ class HouseholdMemberController extends ApiController
      */
     public function editMembership(Request $request, HouseholdMember $member): Response
     {
-        // TODO ACL
+        if (!$this->security->isGranted(HouseholdVoter::EDIT, $member->getHousehold())) {
+            throw new AccessDeniedException('You are not allowed to edit this household');
+        }
 
         $form = $this->createForm(HouseholdMemberType::class, $member, [
             'validation_groups' => ['household_memberships'],

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -973,14 +973,14 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                 // accompanying period
                 AccompanyingPeriodVoter::SEE_DETAILS => [AccompanyingPeriodVoter::SEE],
                 AccompanyingPeriodVoter::CREATE => [AccompanyingPeriodVoter::SEE_DETAILS],
-                AccompanyingPeriodVoter::DELETE => [AccompanyingPeriodVoter::SEE_DETAILS],
+//                AccompanyingPeriodVoter::DELETE => [AccompanyingPeriodVoter::SEE_DETAILS],
                 AccompanyingPeriodVoter::EDIT => [AccompanyingPeriodVoter::SEE_DETAILS],
                 // give all ACL for FULL
                 AccompanyingPeriodVoter::FULL => [
                     AccompanyingPeriodVoter::SEE_DETAILS,
                     AccompanyingPeriodVoter::CREATE,
                     AccompanyingPeriodVoter::EDIT,
-                    AccompanyingPeriodVoter::DELETE,
+//                    AccompanyingPeriodVoter::DELETE,
                 ],
                 AccompanyingPeriodVoter::REASSIGN_BULK => [
                     AccompanyingPeriodVoter::CONFIDENTIAL_CRUD,

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

@@ -17,12 +17,14 @@
                class="btn btn-cancel">{{ 'Person details'|trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE') %}
         <li>
             <a class="btn btn-create"
                href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button">
                 {{ 'Create an accompanying period'|trans }}
             </a>
         </li>
+        {% endif %}
 
         {#  Disabled dropdown
         <li class="dropdown">

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

@@ -30,12 +30,13 @@
                                 {{ customButtons['before'] }}
                             {% endif %}
 
-                            <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>
-
+                            {% 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

@@ -40,13 +40,14 @@
                 {{ 'Household summary'|trans }}
             </a>
         </li>
-        {# TODO: add ACL to check if user is allowed to edit household? #}
-        <li>
-            <a class="btn btn-create"
-                href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
-                {{ 'Create an accompanying period'|trans }}
-            </a>
-        </li>
+        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE') %}
+            <li>
+                <a class="btn btn-create"
+                    href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
+                    {{ 'Create an accompanying period'|trans }}
+                </a>
+            </li>
+        {% endif %}
     </ul>
 
 </div>

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

@@ -10,7 +10,7 @@
     {% if household.addresses|length == 0 %}
         <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
     {% else %}
-
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
         <ul class="record_actions my-3">
             <li style="margin: auto;">
 
@@ -27,7 +27,7 @@
 
             </li>
         </ul>
-
+    {% endif %}
         <div class="address-timeline grid">
 
         <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
@@ -92,14 +92,16 @@
                 {{ 'Back to household'|trans }}
             </a>
         </li>
-        <li>
+        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+            <li>
 
-            <a class="btn btn-create"
-                href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-                {{ 'Move household'|trans }}
-            </a>
+                <a class="btn btn-create"
+                    href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+                    {{ 'Move household'|trans }}
+                </a>
 
-        </li>
+            </li>
+        {% endif %}
     </ul>
 
 </div>

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

@@ -27,20 +27,22 @@
             {% endif %}
 
             <ul class="list-inline text-right mt-2">
-                <li class="list-inline-item">
-                    {# include vue_address component #}
-                    {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
-                        targetEntity: { name: 'household', id: household.id },
-                        backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
-                        onlyButton: true,
-                        mode: 'new',
-                        buttonSize: 'btn-sm',
-                        buttonText: 'Move household',
-                        modalTitle: 'Move household',
-                        buttonDisplayText: false,
-                        useValidFrom: true,
-                    } %}
-                </li>
+                {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                    <li class="list-inline-item">
+                        {# include vue_address component #}
+                        {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
+                            targetEntity: { name: 'household', id: household.id },
+                            backUrl: path('chill_person_household_summary', { 'household_id': household.id }),
+                            onlyButton: true,
+                            mode: 'new',
+                            buttonSize: 'btn-sm',
+                            buttonText: 'Move household',
+                            modalTitle: 'Move household',
+                            buttonDisplayText: false,
+                            useValidFrom: true,
+                        } %}
+                    </li>
+                {% endif %}
                 <li class="list-inline-item">
                     <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
                        href="{{ path('chill_person_household_addresses', { 'household_id': household.id } ) }}">
@@ -63,28 +65,32 @@
                             <p>
                                 {{ 'household_composition.Since'|trans({'startDate': currentComposition.startDate}) }}
                             </p>
-                            <ul class="record_actions">
-                                <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>
-                            </ul>
+                            {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                                <ul class="record_actions">
+                                    <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>
+                                </ul>
+                            {% endif %}
                         </div>
                     {% else %}
                         <div class="alert alert-danger">
                             <p>
                                 {{ 'household_composition.Currently no composition'|trans }}
                             </p>
-                                <ul class="record_actions" style="margin-bottom: 0">
-                                    <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>
-                                </ul>
+                        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                            <ul class="record_actions" style="margin-bottom: 0">
+                                <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>
+                            </ul>
+                        {% endif %}
                         </div>
                     {% endif %}
                     {% if household.waitingForBirth or not household.commentMembers.isEmpty() %}
@@ -104,18 +110,19 @@
                         </div>
                     {% endif %}
 
-                    {% if not household.commentMembers.isEmpty() %}
-                        <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>
-                    {% else %}
-                        <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>
+                    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+                        {% if not household.commentMembers.isEmpty() %}
+                            <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>
+                        {% else %}
+                            <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 %}
 
                     {{ form_start(form) }}
@@ -167,6 +174,7 @@
 
 
               {% macro customButtons(member, household) %}
+                  {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
                   <li>
                       <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'allow_leave_without_household': true } ) }}"
                          class="btn btn-sm btn-misc" title="{{ 'household.person.leave'|trans }}"><i class="fa fa-scissors"></i></a>
@@ -175,6 +183,7 @@
                       <a href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'persons': [ member.person.id ], 'household': household.id} ) }}"
                          class="btn btn-sm btn-misc" title="{{ 'household.Change position'|trans }}"><i class="fa fa-arrows-h"></i></a>
                   </li>
+                  {% endif %}
               {% endmacro %}
 
               {% if members|length > 0 %}
@@ -244,15 +253,16 @@
 
 
 
-    <ul class="record_actions">
-      <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>
-    </ul>
-
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+        <ul class="record_actions">
+          <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>
+        </ul>
+    {% endif %}
 </div>
 {% endblock %}
 

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

@@ -63,6 +63,41 @@
         {%- endif -%}
     </fieldset>
 
+    {%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
+        <fieldset>
+            <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
+            {%- if form.email is defined -%}
+                <div id="personEmail">
+                    {{ form_row(form.email, {'label': 'Email'}) }}
+                </div>
+            {% endif %}
+            {%- if form.acceptEmail is defined -%}
+                <div id="personAcceptEmail">
+                    {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
+                </div>
+            {%- endif -%}
+
+            {%- if form.phonenumber is defined -%}
+                {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
+            {%- endif -%}
+            {%- if form.mobilenumber is defined -%}
+                <div id="personPhoneNumber">
+                    {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
+                </div>
+                <div id="personAcceptSMS">
+                    {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
+                </div>
+            {%- endif -%}
+            {%- if form.otherPhoneNumbers is defined -%}
+                {{ form_widget(form.otherPhoneNumbers) }}
+                {{ form_errors(form.otherPhoneNumbers) }}
+            {%- endif -%}
+            {%- if form.contactInfo is defined -%}
+                {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
+            {%- endif -%}
+        </fieldset>
+    {%- endif -%}
+
     {%- if form.nationality is defined or form.spokenLanguages is defined -%}
     <fieldset>
         <legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
@@ -93,41 +128,6 @@
     </fieldset>
     {%- endif -%}
 
-    {%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
-    <fieldset>
-        <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
-        {%- if form.email is defined -%}
-            <div id="personEmail">
-                {{ form_row(form.email, {'label': 'Email'}) }}
-            </div>
-        {% endif %}
-        {%- if form.acceptEmail is defined -%}
-            <div id="personAcceptEmail">
-                {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
-            </div>
-        {%- endif -%}
-
-        {%- if form.phonenumber is defined -%}
-            {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
-        {%- endif -%}
-        {%- if form.mobilenumber is defined -%}
-            <div id="personPhoneNumber">
-                {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
-            </div>
-            <div id="personAcceptSMS">
-                {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
-            </div>
-        {%- endif -%}
-        {%- if form.otherPhoneNumbers is defined -%}
-            {{ form_widget(form.otherPhoneNumbers) }}
-            {{ form_errors(form.otherPhoneNumbers) }}
-        {%- endif -%}
-        {%- if form.contactInfo is defined -%}
-            {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
-        {%- endif -%}
-    </fieldset>
-    {%- endif -%}
-
     {{ form_rest(form) }}
 
     <ul class="record_actions sticky-form-buttons">

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

@@ -119,11 +119,13 @@
                                     <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>
-                                <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>
-                                {% if p.isCurrent() %}
+                                {% 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() and is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
                                     <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 }) }}">
                                             <i class="fa fa-scissors"></i>
@@ -138,7 +140,7 @@
                 {% endfor %}
             </div>
 
-            {% if not person.isSharingHousehold() %}
+            {% if not person.isSharingHousehold() and is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
                 <ul class="record_actions">
                     <li>
                         <a class="btn btn-misc" href="{{chill_path_add_return_path('chill_person_household_members_editor', { 'persons': [ person.id ], 'followAfter': true}) }}">
@@ -164,15 +166,16 @@
 
                     {{ _self.bloc_content(p) }}
 
-                    <div class="item-row separator">
-                        <ul class="record_actions">
-                            <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>
-                        </ul>
-                    </div>
-
+                    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', p.household) %}
+                        <div class="item-row separator">
+                            <ul class="record_actions">
+                                <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>
+                            </ul>
+                        </div>
+                    {% endif %}
                 </div>
                 {% endfor %}
             </div>

src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php

@@ -34,7 +34,6 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
         self::SEE_DETAILS,
         self::CREATE,
         self::EDIT,
-        self::DELETE,
         self::FULL,
         self::TOGGLE_CONFIDENTIAL_ALL,
         self::TOGGLE_INTENSITY,
@@ -48,13 +47,6 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
 
     public const CREATE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE';
 
-    /**
-     * role to DELETE the course.
-     *
-     * Will be true only for the creator, and if the course is still at DRAFT step.
-     */
-    public const DELETE = 'CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE';
-
     /**
      * role to EDIT the course.
      *
@@ -132,7 +124,6 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
             self::CONFIDENTIAL_CRUD,
             self::CREATE,
             self::EDIT,
-            self::DELETE,
             self::FULL,
             self::TOGGLE_CONFIDENTIAL_ALL,
             self::REASSIGN_BULK,
@@ -163,7 +154,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
 
         if ($subject instanceof AccompanyingPeriod) {
             if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
-                if (in_array($attribute, [self::EDIT, self::DELETE], true)) {
+                if (in_array($attribute, [self::EDIT], true)) {
                     return false;
                 }