diff --git a/src/Controller/OrganizationController.php b/src/Controller/OrganizationController.php index c694be4..70ae7da 100644 --- a/src/Controller/OrganizationController.php +++ b/src/Controller/OrganizationController.php @@ -5,6 +5,7 @@ namespace App\Controller; use App\Entity\Apps; use App\Entity\Roles; use App\Entity\User; +use App\Entity\UserOrganizatonApp; use App\Entity\UsersOrganizations; use App\Form\OrganizationForm; use App\Service\ActionService; @@ -26,8 +27,7 @@ class OrganizationController extends AbstractController private const ACCESS_DENIED = 'Access denied'; public function __construct(private readonly EntityManagerInterface $entityManager, - private readonly OrganizationsService $organizationsService, - private readonly UserOrganizationService $usersOrganizationService, private readonly ActionService $actionService, private readonly UserService $userService) + private readonly UserService $userService) { } @@ -39,7 +39,17 @@ class OrganizationController extends AbstractController if ($this->isGranted("ROLE_SUPER_ADMIN")){ $organizations = $this->entityManager->getRepository(Organizations::class)->findAll(); } else { - $organizations = $this->organizationsService->getOrganizationsByUser($user); + //get all the UO + $uos = $this->entityManager->getRepository(UsersOrganizations::class)->findBy(['users' => $user]); + $organizations = []; + foreach ($uos as $uo) { + $roleAdmin = $this->entityManager->getRepository(Roles::class)->findOneBy(['name' => 'ADMIN']); + $uoaAdmin = $this->entityManager->getRepository(UserOrganizatonApp::class)->findOneBy(['userOrganization' => $uo, 'role' => $roleAdmin]); + if ($uoaAdmin) { + $organizations[] = $uo->getOrganization(); + } + } + } return $this->render('organization/index.html.twig', [ diff --git a/templates/elements/menu.html.twig b/templates/elements/menu.html.twig index 82e78d4..a330923 100644 --- a/templates/elements/menu.html.twig +++ b/templates/elements/menu.html.twig @@ -37,22 +37,13 @@