[Community] deletes user role on user delete

claroline · Jul 6, 2022 · 1f19366 · 1f19366
1 parent bcc1d15
commit 1f19366
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/src/main/community/Subscriber/Crud/RoleSubscriber.php b/src/main/community/Subscriber/Crud/RoleSubscriber.php
@@ -4,7 +4,6 @@
 
 use Claroline\AppBundle\API\Crud;
 use Claroline\AppBundle\Event\Crud\CreateEvent;
-use Claroline\AppBundle\Event\Crud\DeleteEvent;
 use Claroline\AppBundle\Event\Crud\PatchEvent;
 use Claroline\AppBundle\Event\StrictDispatcher;
 use Claroline\CoreBundle\Entity\AbstractRoleSubject;
@@ -45,7 +44,6 @@ public static function getSubscribedEvents(): array
             Crud::getEventName('create', 'post', Role::class) => 'postCreate',
             Crud::getEventName('patch', 'pre', Role::class) => 'prePatch',
             Crud::getEventName('patch', 'post', Role::class) => 'postPatch',
-            Crud::getEventName('delete', 'pre', Role::class) => 'preDelete',
         ];
     }
 
@@ -111,17 +109,6 @@ public function postCreate(CreateEvent $event)
         }
     }
 
-    public function preDelete(DeleteEvent $event)
-    {
-        /** @var Role $role */
-        $role = $event->getObject();
-
-        if ($role->isReadOnly()) {
-            // abort delete
-            $event->block();
-        }
-    }
-
     public function prePatch(PatchEvent $event)
     {
         /** @var Role $role */

diff --git a/src/main/community/Subscriber/Crud/UserSubscriber.php b/src/main/community/Subscriber/Crud/UserSubscriber.php
@@ -250,7 +250,7 @@ public function preDelete(DeleteEvent $event)
 
         if ($userRole) {
             // this would have been better in the postDelete event, but the username has been changed
-            $this->crud->delete($userRole);
+            $this->crud->delete($userRole, [Crud::NO_PERMISSIONS]);
         }
     }