tp: adapt controller/entity/formtype to works with new ACL (TO BE CHECKED)

* rename type by types -> getTypes() getter
* adapt controller to fix centers errors
* remove voteOnAttribute return always true in voter

src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php

@@ -60,22 +60,12 @@ class ThirdPartyController extends Controller
         $this->denyAccessUnlessGranted(ThirdPartyVoter::SHOW);
         $repository = $this->getDoctrine()->getManager()
             ->getRepository(ThirdParty::class);
-        
+
-        $centers = $this->authorizationHelper
+        $nbThirdParties = $repository->count([]); //$repository->countByMemberOfCenters($centers);
-            ->getReachableCenters(
-                $this->getUser(), 
-                new Role(ThirdPartyVoter::SHOW)
-                );
-        
-        $nbThirdParties = $repository->countByMemberOfCenters($centers);
         $pagination = $this->paginatorFactory->create($nbThirdParties);
-        
+
-        $thirdParties = $repository->findByMemberOfCenters(
+        $thirdParties = $repository->findAll();
-            $centers,
+
-            $pagination->getCurrentPage()->getFirstItemNumber(),
-            $pagination->getItemsPerPage()
-        );
-        
         return $this->render('ChillThirdPartyBundle:ThirdParty:index.html.twig', array(
             'third_parties' => $thirdParties,
             'pagination' => $pagination
@@ -88,18 +78,9 @@ class ThirdPartyController extends Controller
     public function newAction(Request $request)
     {
         $this->denyAccessUnlessGranted(ThirdPartyVoter::CREATE);
-        
+
-        $centers = $this->authorizationHelper
+        $centers = [];
-            ->getReachableCenters(
+
-                $this->getUser(), 
-                new Role(ThirdPartyVoter::CREATE)
-                );
-        
-        if (count($centers) === 0) {
-            throw new \LogicException("There should be at least one center reachable "
-                . "if role ".ThirdPartyVoter::CREATE." is granted");
-        }
-        
         $thirdParty = new ThirdParty();
         $thirdParty->setCenters(new ArrayCollection($centers));
         
@@ -141,18 +122,12 @@ class ThirdPartyController extends Controller
     public function updateAction(ThirdParty $thirdParty, Request $request)
     {
        $this->denyAccessUnlessGranted(ThirdPartyVoter::CREATE);
-        
+
-        $centers = $this->authorizationHelper
+        $repository = $this->getDoctrine()->getManager()
-            ->getReachableCenters(
+            ->getRepository(ThirdParty::class);
-                $this->getUser(), 
+
-                new Role(ThirdPartyVoter::CREATE)
+        $centers = $repository->findAll();
-                );
+
-        
-        if (count($centers) === 0) {
-            throw new \LogicException("There should be at least one center reachable "
-                . "if role ".ThirdPartyVoter::CREATE." is granted");
-        }
-        
         // we want to keep centers the users has no access to. So we will add them
         // later if they are removed. (this is a ugly hack but it will works
         $centersAssociatedNotForUsers = \array_diff(

src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php

@@ -341,7 +341,7 @@ class ThirdParty
      */
     public function getTypes()
     {
-        return $this->type;
+        return $this->types;
     }
 
     /**

src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php

@@ -64,10 +64,10 @@ class ThirdPartyType extends AbstractType
         }
         if (count($types) === 1) {
             $builder
-                ->add('type', HiddenType::class, [
+                ->add('types', HiddenType::class, [
                     'data' => array_values($types)
                 ])
-                ->get('type')
+                ->get('types')
                     ->addModelTransformer(new CallbackTransformer(
                     function (?array $typeArray): ?string {
                         if (null === $typeArray) {
@@ -84,7 +84,7 @@ class ThirdPartyType extends AbstractType
                 ))
             ;
         } else {
-            $builder->add('type', ChoiceType::class, [
+            $builder->add('types', ChoiceType::class, [
                 'choices' => $types,
                 'expanded' => true,
                 'multiple' => true,

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig

@@ -51,7 +51,7 @@
                             <th>{{ (tp.active ? '<i class="fa fa-check chill-green">' : '<i class="fa fa-times chill-red">')|raw }}</th>
                             <td>{{ tp.name }}</td>
                             {% set types = [] %}
-                            {% for t in tp.type %}
+                            {% for t in tp.types %}
                                 {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %}
                             {% endfor %}
                             <td>{{ types|join(', ') }}</td>

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig

@@ -26,7 +26,7 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.type) }}
+            {{ form_row(form.types) }}
             {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig

@@ -48,7 +48,7 @@
 
                 <dt>{{ 'Type'|trans }}</dt>
                 {% set types = [] %}
-                {% for t in thirdParty.type %}
+                {% for t in thirdParty.types %}
                     {% set types = types|merge( [ ('chill_3party.key_label.'~t)|trans ] ) %}
                 {% endfor %}
                 <dd>

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig

@@ -43,7 +43,7 @@
                 {{ form_row(form.profession) }}
             {% endif %}
 
-            {{ form_row(form.type) }}
+            {{ form_row(form.types) }}
             {{ form_row(form.categories) }}
 
             {{ form_row(form.telephone) }}

src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php

@@ -56,8 +56,6 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
      */
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        return true;
-
         $user = $token->getUser();
         
         if (!$user instanceof User) {