IBX-7055: Blocked the possibility of deleting default dashboard

ibexa · Nov 27, 2023 · cb91b26 · cb91b26
1 parent 4163a0d
commit cb91b26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -502,19 +502,14 @@ parameters:
 
 		-
 			message: "#^Cannot call method getContentInfo\\(\\) on Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\|null\\.$#"
-			count: 12
+			count: 11
 			path: src/bundle/Controller/LocationController.php
 
 		-
 			message: "#^Parameter \\#1 \\$contentInfo of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\LocationService\\:\\:createLocation\\(\\) expects Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\ContentInfo, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\ContentInfo\\|null given\\.$#"
 			count: 1
 			path: src/bundle/Controller/LocationController.php
 
-		-
-			message: "#^Parameter \\#1 \\$location of method Ibexa\\\\Contracts\\\\AdminUi\\\\Controller\\\\Controller\\:\\:redirectToLocation\\(\\) expects Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\|null given\\.$#"
-			count: 1
-			path: src/bundle/Controller/LocationController.php
-
 		-
 			message: "#^Parameter \\#1 \\$location of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\LocationService\\:\\:getLocationChildCount\\(\\) expects Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\|null given\\.$#"
 			count: 1

diff --git a/src/bundle/Controller/LocationController.php b/src/bundle/Controller/LocationController.php
@@ -401,26 +401,13 @@ private function handleTrashLocation(LocationTrashData $data): RedirectResponse
             ) {
                 $this->trashRelatedAsset($location->getContentInfo());
             }
-            $trashItem = $this->trashService->trash($location);
+            $this->trashService->trash($location);
             $this->repository->commit();
         } catch (\Exception $exception) {
             $this->repository->rollback();
             throw $exception;
         }
 
-        if ($trashItem === null) {
-            $this->notificationHandler->info(
-                $this->translator->trans(
-                    /** @Desc("Location '%name%' was not moved to Trash.") */
-                    'location.trash.failure',
-                    ['%name%' => $location->getContentInfo()->name],
-                    'ibexa_location'
-                )
-            );
-
-            return $this->redirectToLocation($location);
-        }
-
         $this->notificationHandler->success(
             $this->translator->trans(
                 /** @Desc("Location '%name%' moved to Trash.") */