diff --git a/application/src/Controller/SourceController.php b/application/src/Controller/SourceController.php index 86e265a..7c72343 100644 --- a/application/src/Controller/SourceController.php +++ b/application/src/Controller/SourceController.php @@ -26,6 +26,8 @@ class SourceController extends FOSRestController public function show(Request $request, int $id): Response { $source = $this->loadSource($request, $id); + $assembler = $this->get(SourceDTOAssember::class); + $dto = $assembler->build($source, $this->getUser()); $view = $this->view($source, 200) ->setTemplate((new SourceTemplateFactory($source, $request))->getTemplatePath()) ->setTemplateVar('source'); diff --git a/application/src/Entity/AndOperation.php b/application/src/Entity/AndOperation.php index a5d727d..a0bb3e2 100644 --- a/application/src/Entity/AndOperation.php +++ b/application/src/Entity/AndOperation.php @@ -25,7 +25,6 @@ class AndOperation extends AbstractOperation foreach ($this->operands->toArray() as $operand) { if (!$operand->getResult()->getBool()) { $this->result->setAll(false); - return; } } diff --git a/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php b/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php index dcea30e..73cdbe3 100644 --- a/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php +++ b/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php @@ -2,8 +2,8 @@ namespace App\Structur\Facade\Security\Source; -use App\Entity\NodeInterface; -use App\Entity\SourceInterface; +use App\Entity\Interfaces\NodeInterface; +use App\Entity\Interfaces\SourceInterface; use App\Entity\User; use App\DBAL\Types\RightType; use App\DBAL\Types\LayerType; diff --git a/application/src/Structur/Facade/Security/Source/UserSourceFacade.php b/application/src/Structur/Facade/Security/Source/UserSourceFacade.php index 0b04ca7..ac96ef7 100644 --- a/application/src/Structur/Facade/Security/Source/UserSourceFacade.php +++ b/application/src/Structur/Facade/Security/Source/UserSourceFacade.php @@ -2,9 +2,9 @@ namespace App\Structur\Facade\Security\Source; -use App\Entity\NameSourceInterface; +use App\Entity\Interfaces\NameSourceInterface; use App\Entity\User; -use App\Entity\UserSourceInterface; +use App\Entity\Interfaces\UserSourceInterface; use App\DBAL\Types\RightType; use App\DBAL\Types\LayerType;