Commit 8b1baf89 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/master'

parents b35b51a9 f0c988b4

module/Application/src/Service/AbstractEntityService.php

+2 −2
Original line number Diff line number Diff line
@@ -517,8 +517,8 @@ abstract class AbstractEntityService extends AbstractService 
        if (!$structure){

            $qb->andWhere("$alias.structure IS NULL");

        }else{

            $qb->leftJoin("$alias.structure", 'strids');

            $qb->andWhere($e->like("strids.ids", $e->literal($structure->idsFilter())));

            $qb->leftJoin("$alias.structure", $alias.'strids');

            $qb->andWhere($e->like($alias."strids.ids", $e->literal($structure->idsFilter())));

        }



        return $qb;

module/Signature/src/Controller/SignatureFlowController.php

+7 −2
Original line number Diff line number Diff line
@@ -81,8 +81,13 @@ class SignatureFlowController extends AbstractController 
            try{

                $this->getServiceSignatureFlow()->delete($signatureFlow);

            }catch (\Exception $e){

                if(str_contains($e->getMessage(), 'ORA-02292'))

                {

                    $this->flashMessenger()->addErrorMessage('Vous ne pouvez pas supprimer ce circuit de signature, car vous avez déjà des signatures électroniques qui l\'utilisent');

                }

                else{

                    $this->flashMessenger()->addErrorMessage($e->getMessage());



                }

            }

        }