diff --git a/src/Controller/UDS/OrganizationalUnitController.php b/src/Controller/UDS/OrganizationalUnitController.php index 839a952..ac31ae0 100644 --- a/src/Controller/UDS/OrganizationalUnitController.php +++ b/src/Controller/UDS/OrganizationalUnitController.php @@ -93,18 +93,12 @@ class OrganizationalUnitController extends AbstractController ->getRepository(ImageImageRepository::class) ->findBy(['remotePc' => true]); - $seen = []; $data = []; foreach ($iirs as $iir) { - $image = $iir->getImage(); - if (!$image || isset($seen[$image->getId()])) { - continue; - } - $seen[$image->getId()] = true; $data[] = [ - 'id' => $image->getId(), - 'name' => $image->getName(), + 'id' => $iir->getId(), + 'name' => $iir->getName(), 'inremotepc' => true, 'ou' => ['id' => $centerId], ]; diff --git a/src/Controller/UDS/RemotePcController.php b/src/Controller/UDS/RemotePcController.php index 7ae0273..c42a15a 100644 --- a/src/Controller/UDS/RemotePcController.php +++ b/src/Controller/UDS/RemotePcController.php @@ -263,7 +263,7 @@ class RemotePcController extends AbstractController { foreach ($client->getPartitions() as $partition) { $iir = $partition->getImage(); - if ($iir && $iir->getImage() && $iir->getImage()->getId() === $imageId) { + if ($iir && $iir->getId() === $imageId) { return $partition; } } diff --git a/src/Repository/ClientRepository.php b/src/Repository/ClientRepository.php index 65b9d68..878bc74 100644 --- a/src/Repository/ClientRepository.php +++ b/src/Repository/ClientRepository.php @@ -174,11 +174,10 @@ class ClientRepository extends AbstractRepository ->join('c.organizationalUnit', 'lab') ->join('c.partitions', 'p') ->join('p.image', 'iir') - ->join('iir.image', 'img') ->leftJoin('c.remotePC', 'rpc') ->where('lab.path LIKE :pathPrefix') ->andWhere('lab.remotePc = true') - ->andWhere('img.id = :imageId') + ->andWhere('iir.id = :imageId') ->andWhere('iir.remotePc = true') ->andWhere('c.maintenance = false') ->andWhere('(rpc.reservedUntil IS NULL OR rpc.reservedUntil < :now)') diff --git a/src/Service/UDS/UDSClient.php b/src/Service/UDS/UDSClient.php index b9971a9..273f552 100644 --- a/src/Service/UDS/UDSClient.php +++ b/src/Service/UDS/UDSClient.php @@ -250,7 +250,7 @@ class UDSClient { foreach ($client->getPartitions() as $partition) { $iir = $partition->getImage(); - if ($iir && $iir->getImage() && $iir->getImage()->getId() === $imageId) { + if ($iir && $iir->getId() === $imageId) { return true; } }