BO : add page(s) admin + fix role admin for super admin

config/services.yaml

@@ -355,8 +355,8 @@ services:
         tags:
             - name: sonata.admin
               manager_type: orm
-              group: "Pages"
-              label: "Pages"
+              group: "Import"
+              label: "Import"
               show_mosaic_button: false
         public: true
 

src/Admin/AdherentAdmin.php

@@ -12,7 +12,6 @@ use App\Enum\MoyenEnum;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
 use FOS\UserBundle\FOSUserEvents;
 use Knp\Menu\ItemInterface as MenuItemInterface;
-use Knp\Menu\ItemInterface;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;

src/Application/Sonata/UserBundle/Admin/GroupAdmin.php

@@ -21,7 +21,9 @@ class GroupAdmin extends BaseGroupAdmin
     protected function configureRoutes(RouteCollection $collection)
     {
         $subject = $this->getSubject();
-        $collection->clearExcept('list');
+        if ($subject != null && !($subject->isGranted('ROLE_SUPER_ADMIN') || $subject->isGranted('ROLE_ADMIN_SIEGE'))) {
+            $collection->clearExcept('list');
+        }
     }
 
     public function getBatchActions()

src/Application/Sonata/UserBundle/Admin/UserAdmin.php

@@ -213,39 +213,41 @@ class UserAdmin extends BaseUserAdmin
             if ($subject->isGranted('ROLE_COMPTOIR') && !empty($subject->getComptoirsgere())) {
                 $hideOrShowComptoir = [];
             }
-            $formMapper->with('Groups')
-                ->add('groups', ModelType::class, [
-                    'required' => false,
-                    'expanded' => true,
-                    'multiple' => true,
-                ])
-                ->add('groupesgere', null, [
-                    'required' => false,
-                    'label' => 'Groupe local géré (obligatoire)',
-                    'attr' => $hideOrShowGroupe,
-                    'label_attr' => $hideOrShowGroupe,
-                ])
-                ->add('comptoirsgere', null, [
-                    'required' => false,
-                    'label' => 'Comptoir géré (obligatoire)',
-                    'attr' => $hideOrShowComptoir,
-                    'label_attr' => $hideOrShowComptoir,
-                ])
-            ->end();
-            $formMapper->end();
+            $formMapper
+                ->with('Groups')
+                    ->add('groups', ModelType::class, [
+                        'required' => false,
+                        'expanded' => true,
+                        'multiple' => true,
+                    ])
+                    ->add('groupesgere', null, [
+                        'required' => false,
+                        'label' => 'Groupe local géré (obligatoire)',
+                        'attr' => $hideOrShowGroupe,
+                        'label_attr' => $hideOrShowGroupe,
+                    ])
+                    ->add('comptoirsgere', null, [
+                        'required' => false,
+                        'label' => 'Comptoir géré (obligatoire)',
+                        'attr' => $hideOrShowComptoir,
+                        'label_attr' => $hideOrShowComptoir,
+                    ])
+                ->end()
+                ->with('Roles')
+                    ->add('realRoles', SecurityRolesType::class, [
+                        'label' => 'form.label_roles',
+                        'expanded' => true,
+                        'multiple' => true,
+                        'required' => false,
+                    ])
+                ->end()
+            ->end()
+            ;
         }
-                // ->with('Roles')
-                //     ->add('realRoles', SecurityRolesType::class, [
-                //         'label' => 'form.label_roles',
-                //         'expanded' => true,
-                //         'multiple' => true,
-                //         'required' => false,
-                //     ])
-                // ->end()
-                // ->with('Keys')
-                //     ->add('token', null, ['required' => false])
-                //     ->add('twoStepVerificationCode', null, ['required' => false])
-                // ->end()
+        // ->with('Keys')
+        //     ->add('token', null, ['required' => false])
+        //     ->add('twoStepVerificationCode', null, ['required' => false])
+        // ->end()
     }
 
     public function getBatchActions()

src/Entity/Flux.php

@@ -267,7 +267,7 @@ abstract class Flux
                 $em = $event->getEntityManager();
                 $flux->getExpediteur()->setCompte($compteExp);
                 $em->persist($flux->getExpediteur());
-                if ($this->getParenttype() != 'vente') {
+                if ($flux->getParenttype() != 'vente') {
                     $compteDest = $flux->getDestinataire()->getCompte() + $flux->getMontant();
                     $flux->getDestinataire()->setCompte($compteDest);
                     $em->persist($flux->getDestinataire());